luckysheet集成

business-common/src/main/java/com/rongwei/bscommon/sys/dao/LuckysheetDao.java

@@ -1,8 +1,12 @@
 package com.rongwei.bscommon.sys.dao;
 
+import com.alibaba.fastjson.JSONObject;
 import com.rongwei.bsentity.domain.LuckysheetDo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -17,4 +21,41 @@ public interface LuckysheetDao extends BaseMapper<LuckysheetDo> {
     @Insert("insert into luckysheet(id, is_delete, \"index\", list_id, block_id, json_data, \"order\", \"status\") " +
             "values (#{id}, #{isDelete}, #{index}, #{listId}, #{blockId}, #{jsonData}, #{order}, #{status})")
     int insert(LuckysheetDo param);
+
+    /**
+     * 查询车间
+     *
+     * @return
+     */
+    @Select("SELECT " +
+            "o.ID, " +
+            "o.PID, " +
+            "o.SHORTNAME, " +
+            "so.SHORTNAME AS pshortName " +
+            "FROM " +
+            "SYS_ORGANIZATION o " +
+            "JOIN SYS_ORGANIZATION so ON so.ID = o.PID  " +
+            "WHERE " +
+            "o.DELETED = '0' " +
+            "AND o.ORGTYPE = '10'")
+    List<JSONObject> getWorkshop();
+
+    /**
+     * 整改组织
+     *
+     * @return
+     */
+    @Select("SELECT " +
+            "NAME as SHORTNAME, " +
+            "VALUE as ID, " +
+            "DICTTYPE " +
+            "FROM " +
+            "SYS_DICT sd " +
+            "WHERE " +
+            "DICTTYPE = 'rectification_organization' " +
+            "AND DELETED = '0' " +
+            "AND PID <> '-1' " +
+            "ORDER BY " +
+            "SORT")
+    List<JSONObject> getWorkshopDict();
 }

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxProjectManageServiceImpl.java

@@ -1,6 +1,8 @@
 package com.rongwei.bscommon.sys.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.aspose.cells.*;
+import com.rongwei.bscommon.sys.dao.LuckysheetDao;
 import com.rongwei.bscommon.sys.service.ZhcxItpProjectNodesService;
 import com.rongwei.bscommon.sys.service.ZhcxProjectDeviceNumberService;
 import com.rongwei.bscommon.sys.utils.ProjectSummaryExcelHelp;
@@ -43,6 +45,9 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
     @Autowired
     private ZhcxItpProjectNodesService itpProjectNodesService;
 
+    @Autowired
+    private LuckysheetDao dao;
+
     /**
      * 生成汇总文件
      *
@@ -80,6 +85,8 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
         //获取项目机号
         List<String> deviceNumberList = projectDeviceNumberService.getDeviceNumberByProjectId(manageDo.getId());
 
+        List<JSONObject> workshopList = getWorkshop();
+
         //构件
         List<String> structureList = itpProjectNodesService.getStructureByProjectId(manageDo.getId());
 
@@ -87,10 +94,29 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
                 .deviceNumberList(deviceNumberList)
                 .fileName(fileName)
                 .structureList(structureList)
+                .workshopList(workshopList)
                 .build();
         return excelDto;
     }
 
+    /**
+     * 获取车间列表
+     *
+     * @return
+     */
+    private List<JSONObject> getWorkshop() {
+
+        //正常组织结构
+        List<JSONObject> workshopList = dao.getWorkshop();
+
+        //额外数据字典中配置
+        List<JSONObject> workshopDictList = dao.getWorkshopDict();
+
+        workshopList.addAll(workshopDictList);
+
+        return workshopList;
+    }
+
     /**
      * 组装文件
      *

business-common/src/main/java/com/rongwei/bscommon/sys/utils/LuckySheet4SummaryHelp.java

@@ -5,8 +5,10 @@ import com.alibaba.fastjson.JSONObject;
 import com.rongwei.bsentity.dto.luckysheet.AssembleCellParam;
 import com.rongwei.bsentity.dto.project.ProjectSummaryParamExcelDto;
 import com.rongwei.bsentity.dto.project.SheetInfoParam;
+import com.rongwei.rwcommon.utils.StringUtils;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class LuckySheet4SummaryHelp {
 
@@ -603,9 +605,19 @@ public class LuckySheet4SummaryHelp {
      */
     public static JSONObject getDataVerification(ProjectSummaryParamExcelDto paramExcelDto) {
         JSONObject result = new JSONObject();
+
+        //部门
+        List<String> departList = paramExcelDto.getWorkshopList().stream()
+                .map(item -> item.getString("SHORTNAME"))
+                .collect(Collectors.toList());
+        String departChose = StringUtils.join(departList, ",");
+
         for(int m = 0,  n = paramExcelDto.getDeviceNumberList().size(); m <= n; m++) {
             int colPos = 4 + m * 4;
+            int departColPos = 5 + 4 * m;
             for(int startRows = 3, endRows = 200; startRows < endRows; startRows++) {
+
+                //状态
                 /**
                  * "3_4": {
                  * 			"type": "dropdown",
@@ -618,19 +630,46 @@ public class LuckySheet4SummaryHelp {
                  * 			"prohibitInput": false
                  * }
                  */
-                JSONObject statusObj = new JSONObject();
-                statusObj.put("type", "dropdown");
-                statusObj.put("remote", false);
-                statusObj.put("value1", "OK,X,√");
-                statusObj.put("value2", "");
-                statusObj.put("checked", false);
-                statusObj.put("hintShow", false);
-                statusObj.put("hintText", "");
-                statusObj.put("prohibitInput", false);
+                JSONObject statusObj = getNewDataVerification("OK,X,√");
+
                 result.put(String.valueOf(startRows).concat("_").concat(String.valueOf(colPos)), statusObj);
+
+                //部门
+                /**
+                 * "3_4": {
+                 * 			"type": "dropdown",
+                 * 			"remote": false,
+                 * 			"value1": "OK,X,√",
+                 * 			"value2": "",
+                 * 			"checked": false,
+                 * 			"hintShow": false,
+                 * 			"hintText": "",
+                 * 			"prohibitInput": false
+                 * }
+                 */
+                //施工部门
+                JSONObject departObj = getNewDataVerification(departChose);
+                result.put(String.valueOf(startRows).concat("_").concat(String.valueOf(departColPos)), departObj);
+
+                //责任部门
+                JSONObject depart2Obj = getNewDataVerification(departChose);
+                result.put(String.valueOf(startRows).concat("_").concat(String.valueOf(departColPos + 1)), depart2Obj);
             }
         }
 
         return result;
     }
+
+    public static JSONObject getNewDataVerification(String options) {
+        JSONObject departObj = new JSONObject();
+        departObj.put("type", "dropdown");
+        departObj.put("remote", false);
+        departObj.put("value1", options);
+        departObj.put("value2", "");
+        departObj.put("checked", false);
+        departObj.put("hintShow", false);
+        departObj.put("hintText", "");
+        departObj.put("prohibitInput", false);
+        return departObj;
+    }
 }

business-dameng/src/main/java/com/rongwei/luckysheet/dameng/datasource/ProfiledemoApplication.java

@@ -19,33 +19,33 @@ import javax.sql.DataSource;
  * 开启注解事务管理，等同于xml配置文件中的 <tx:annotation-driven />
  * @author Administrator
  */
-//@EnableTransactionManagement
-//@Configuration
-//public class ProfiledemoApplication implements TransactionManagementConfigurer {
-public class ProfiledemoApplication {
-//    /**
-//     * postgre数据源
-//     */
+@EnableTransactionManagement
+@Configuration
+public class ProfiledemoApplication implements TransactionManagementConfigurer {
+//public class ProfiledemoApplication {
+    /**
+     * postgre数据源
+     */
 //    @Resource(name = "damengDataSource")
 //    @Autowired
 //    private DataSource damengDataSource;
-//
-//
-//    @Bean(name = "damengTxManager")
-//    public PlatformTransactionManager postgreTxManager() {
-//        return new DataSourceTransactionManager(damengDataSource);
-//    }
-//
-//
-//    @Resource(name="damengTxManager")
-//    private PlatformTransactionManager txManager;
-//
-//    /**
-//     * 实现接口 TransactionManagementConfigurer 方法，其返回值代表在拥有多个事务管理器的情况下默认使用的事务管理器
-//     * @return
-//     */
-//    @Override
-//    public PlatformTransactionManager annotationDrivenTransactionManager() {
-//        return txManager;
-//    }
+
+
+    @Bean(name = "damengTxManager")
+    public PlatformTransactionManager postgreTxManager(DataSource damengDataSource) {
+        return new DataSourceTransactionManager(damengDataSource);
+    }
+
+
+    @Resource(name="damengTxManager")
+    private PlatformTransactionManager txManager;
+
+    /**
+     * 实现接口 TransactionManagementConfigurer 方法，其返回值代表在拥有多个事务管理器的情况下默认使用的事务管理器
+     * @return
+     */
+    @Override
+    public PlatformTransactionManager annotationDrivenTransactionManager() {
+        return txManager;
+    }
 }

business-dameng/src/main/java/com/rongwei/luckysheet/dameng/impl/RecordDataInsertHandle.java

@@ -32,7 +32,7 @@ public class RecordDataInsertHandle extends BaseHandle implements IRecordDataIns
             jdbcTemplateDameng.update(sql,snowFlake.nextId().longValue(), pgModel.getBlock_id().trim(),pgModel.getIndex(),pgModel.getList_id(),pgModel.getStatus(),pgModel.getJson_data().toJSONString(),pgModel.getOrder());
             return "";
         }catch (Exception e){
-            log.warn(e.getMessage());
+            log.error("sql执行异常, {}", e);
         }
         return null;
     }
@@ -68,7 +68,7 @@ public class RecordDataInsertHandle extends BaseHandle implements IRecordDataIns
             log.info("InsertIntoBatch count {}",i);
             return "";
         }catch (Exception ex){
-            log.error(ex.toString());
+            log.error("sql执行异常: {}", ex);
             return null;
         }
     }
@@ -127,7 +127,7 @@ public class RecordDataInsertHandle extends BaseHandle implements IRecordDataIns
             log.info("InsertBatchDb count {}",i);
             return "";
         }catch (Exception ex){
-            log.error(ex.getMessage());
+            log.error("sql执行异常：{}", ex);
             return null;
         }
     }

business-dameng/src/main/java/com/rongwei/luckysheet/dameng/impl/RecordDataUpdataHandle.java

@@ -43,7 +43,7 @@ public class RecordDataUpdataHandle extends BaseHandle implements IRecordDataUpd
      * @param ids
      * @return
      */
-    @Transactional(rollbackFor = Exception.class)
+    @Transactional(value = "damengTxManager",rollbackFor = Exception.class)
     @Override
     public Boolean updateMulti2(List<JSONObject> blocks, List<String> ids) {
         try{
@@ -287,7 +287,7 @@ public class RecordDataUpdataHandle extends BaseHandle implements IRecordDataUpd
      * @param model
      * @return
      */
-    @Transactional(rollbackFor = Exception.class)
+    @Transactional(value = "damengTxManager",rollbackFor = Exception.class)
     @Override
     public boolean updateDataStatus(GridRecordDataModel model) {
         try{
@@ -314,7 +314,7 @@ public class RecordDataUpdataHandle extends BaseHandle implements IRecordDataUpd
      * @param index2
      * @return
      */
-    @Transactional(rollbackFor = Exception.class)
+    @Transactional(value = "damengTxManager",rollbackFor = Exception.class)
     @Override
     public boolean updateDataMsgHide(GridRecordDataModel model, Integer hide, String index1, String index2) {
         try{
@@ -339,7 +339,7 @@ public class RecordDataUpdataHandle extends BaseHandle implements IRecordDataUpd
      * @param index
      * @return
      */
-    @Transactional(rollbackFor = Exception.class)
+    @Transactional(value = "damengTxManager",rollbackFor = Exception.class)
     @Override
     public boolean updateDataMsgNoHide(GridRecordDataModel model, Integer hide, String index) {
         try{
@@ -413,7 +413,7 @@ public class RecordDataUpdataHandle extends BaseHandle implements IRecordDataUpd
      * @param words
      * @return
      */
-    @Transactional(rollbackFor = Exception.class)
+    @Transactional(value = "damengTxManager",rollbackFor = Exception.class)
     @Override
     public boolean updateJsonbForInsertNull(JSONObject query, String word, JSONObject db, Integer position, String words) {
         String condition="";
@@ -444,7 +444,7 @@ public class RecordDataUpdataHandle extends BaseHandle implements IRecordDataUpd
             return true;
         }catch (Exception ex){
             log.error("异常信息", ex);
-            throw new RuntimeException(ex.getMessage());
+            return false;
         }
     }
 
@@ -457,7 +457,7 @@ public class RecordDataUpdataHandle extends BaseHandle implements IRecordDataUpd
      * @param position
      * @return
      */
-    @Transactional(rollbackFor = Exception.class)
+    @Transactional(value = "damengTxManager",rollbackFor = Exception.class)
     @Override
     public boolean updateJsonbForSetNull(JSONObject query, String word, JSONObject db, Integer position) {
         String condition="";
@@ -497,7 +497,7 @@ public class RecordDataUpdataHandle extends BaseHandle implements IRecordDataUpd
      * @param words
      * @return
      */
-    @Transactional(rollbackFor = Exception.class)
+    @Transactional(value = "damengTxManager",rollbackFor = Exception.class)
     @Override
     public boolean updateJsonbForSetRootNull(JSONObject query, String word, JSONObject db, Integer position, String words) {
         String condition="";

business-dameng/src/main/java/com/rongwei/luckysheet/dameng/impl/RecordDelHandle.java

@@ -33,7 +33,7 @@ public class RecordDelHandle extends BaseHandle implements IRecordDelHandle {
             jdbcTemplateDameng.update(sql1,new Object[]{model.getIs_delete(),model.getList_id(),model.getIndex()});
             return true;
         }catch (Exception e){
-            log.error(e.getMessage());
+            log.error("sql执行异常, {}", e);
             return false;
         }
     }
@@ -56,7 +56,7 @@ public class RecordDelHandle extends BaseHandle implements IRecordDelHandle {
             jdbcTemplateDameng.update(delsql);
             return "";
         }catch (Exception ex){
-            log.error(ex.toString());
+            log.error("sql执行异常, {}", ex);
             return ex.toString();
         }
     }

business-entity/src/main/java/com/rongwei/bsentity/dto/project/ProjectSummaryParamExcelDto.java

@@ -1,5 +1,6 @@
 package com.rongwei.bsentity.dto.project;
 
+import com.alibaba.fastjson.JSONObject;
 import lombok.*;
 
 import java.util.List;
@@ -30,4 +31,9 @@ public class ProjectSummaryParamExcelDto {
      * 构件名称
      */
     private List<String> structureList;
+
+    /**
+     * 车间列表
+     */
+    private List<JSONObject> workshopList;
 }

business-server/src/main/java/com/rongwei/bsserver/controller/JfGridFileController.java

@@ -1,11 +1,11 @@
 package com.rongwei.bsserver.controller;
 
 import com.alibaba.fastjson.JSONObject;
-import com.rongwei.bscommon.sys.db.server.JfGridFileGetService;
+import com.rongwei.bsserver.db.server.JfGridFileGetService;
 import com.rongwei.bscommon.sys.utils.JsonUtil;
-import com.rongwei.bscommon.sys.utils.Pako_GzipUtils;
-import com.rongwei.bsentity.domain.luckysheet.LuckySheetGridModel;
-import com.rongwei.bsentity.domain.luckysheet.enummodel.OperationTypeEnum;
+import com.rongwei.bsserver.utils.Pako_GzipUtils;
+import com.rongwei.bsserver.entity.LuckySheetGridModel;
+import com.rongwei.bsserver.entity.enummodel.OperationTypeEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

business-common/src/main/java/com/rongwei/bscommon/sys/db/server/JfGridFileGetService.java

@@ -1,9 +1,9 @@
-package com.rongwei.bscommon.sys.db.server;
+package com.rongwei.bsserver.db.server;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.rongwei.bscommon.sys.redisserver.GridFileRedisCacheService;
-import com.rongwei.bscommon.sys.utils.GzipHandle;
+import com.rongwei.bsserver.redisserver.GridFileRedisCacheService;
+import com.rongwei.bsserver.utils.GzipHandle;
 import com.rongwei.luckysheet.JfGridConfigModel;
 import com.rongwei.luckysheet.db.IRecordDataInsertHandle;
 import com.rongwei.luckysheet.db.IRecordDataUpdataHandle;

business-common/src/main/java/com/rongwei/bscommon/sys/db/server/JfGridUpdateService.java

@@ -1,18 +1,18 @@
-package com.rongwei.bscommon.sys.db.server;
+package com.rongwei.bsserver.db.server;
 
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.rongwei.bscommon.sys.redisserver.GridFileRedisCacheService;
-import com.rongwei.bscommon.sys.redisserver.RedisLock;
-import com.rongwei.bscommon.sys.utils.GzipHandle;
+import com.rongwei.bsserver.redisserver.GridFileRedisCacheService;
+import com.rongwei.bsserver.redisserver.RedisLock;
+import com.rongwei.bsserver.utils.GzipHandle;
 import com.rongwei.bscommon.sys.utils.JsonUtil;
-import com.rongwei.bsentity.domain.luckysheet.ConfigMergeModel;
-import com.rongwei.bsentity.domain.luckysheet.LuckySheetGridModel;
-import com.rongwei.bsentity.domain.luckysheet.enummodel.DisabledTypeEnum;
-import com.rongwei.bsentity.domain.luckysheet.enummodel.SheetOperationEnum;
+import com.rongwei.bsserver.entity.ConfigMergeModel;
+import com.rongwei.bsserver.entity.LuckySheetGridModel;
+import com.rongwei.bsserver.entity.enummodel.DisabledTypeEnum;
+import com.rongwei.bsserver.entity.enummodel.SheetOperationEnum;
 import com.rongwei.luckysheet.JfGridConfigModel;
 import com.rongwei.luckysheet.db.IRecordDataInsertHandle;
 import com.rongwei.luckysheet.db.IRecordDataUpdataHandle;
@@ -366,7 +366,7 @@ public class JfGridUpdateService {
                             models.add(model);
                         }
                     } catch (Exception ex) {
-                        log.error(ex.toString());
+                        log.error("异常信息：{}", ex);
                     }
                 }
 
@@ -891,7 +891,7 @@ public class JfGridUpdateService {
                     try {
                         _v = bson.get("v").toString();
                     } catch (Exception e) {
-                        log.error("DBObject---error");
+                        log.error("DBObject---error: {}", e);
                         _v = bson.get("v");
                     }
 
@@ -943,7 +943,7 @@ public class JfGridUpdateService {
                     _result = recordDataUpdataHandle.updateCellDataListValue(query, keyName, null, _v);
                     //update.set("jfgridfile."+_sheetPosition+"."+k,_vdb);
                 } catch (Exception ex) {
-                    log.error("Operation_all--erorr:" + ex.toString());
+                    log.error("Operation_all--erorr: {}", ex);
                     _v = "\"" + _v + "\"";
                     _result = recordDataUpdataHandle.updateCellDataListTxtValue(query, keyName, null, _v);
                     //update.set("jfgridfile."+_sheetPosition+"."+k,_v);
@@ -956,7 +956,7 @@ public class JfGridUpdateService {
             }
 
         } catch (Exception ex) {
-            log.error("Operation_all--err--all:" + ex.getMessage());
+            log.error("Operation_all--err--all: {}", ex);
         }
         return "";
     }
@@ -1802,7 +1802,7 @@ public class JfGridUpdateService {
                         log.info("更新失败");
                     }
                 } catch (Exception e) {
-                    log.warn(e.getMessage());
+                    log.error("异常信息：{}", e);
                 } finally {
 
                 }
@@ -2087,7 +2087,7 @@ public class JfGridUpdateService {
                 loadRvMsgForLock(gridKey, bsons, key);
             }
         } catch (Exception e) {
-
+            log.error("redis加载异常, {}", e);
         } finally {
             redisLock.unlock();
         }

business-entity/src/main/java/com/rongwei/bsentity/domain/luckysheet/BaseModel.java

@@ -1,4 +1,4 @@
-package com.rongwei.bsentity.domain.luckysheet;
+package com.rongwei.bsserver.entity;
 
 
 /**

business-entity/src/main/java/com/rongwei/bsentity/domain/luckysheet/BaseOperationModel.java

@@ -1,4 +1,4 @@
-package com.rongwei.bsentity.domain.luckysheet;
+package com.rongwei.bsserver.entity;
 
 import lombok.Data;
 

business-entity/src/main/java/com/rongwei/bsentity/domain/luckysheet/ConfigMergeModel.java

@@ -1,4 +1,4 @@
-package com.rongwei.bsentity.domain.luckysheet;
+package com.rongwei.bsserver.entity;
 
 import com.alibaba.fastjson.JSONObject;
 import lombok.Data;

business-entity/src/main/java/com/rongwei/bsentity/domain/luckysheet/LuckySheetGridModel.java

@@ -1,4 +1,4 @@
-package com.rongwei.bsentity.domain.luckysheet;
+package com.rongwei.bsserver.entity;
 
 
 import lombok.Data;

business-entity/src/main/java/com/rongwei/bsentity/domain/luckysheet/enummodel/DisabledTypeEnum.java

@@ -1,4 +1,4 @@
-package com.rongwei.bsentity.domain.luckysheet.enummodel;
+package com.rongwei.bsserver.entity.enummodel;
 
 /**
  * @author zhouhang

business-entity/src/main/java/com/rongwei/bsentity/domain/luckysheet/enummodel/ExcelCenterStyleEnum.java

@@ -1,4 +1,4 @@
-package com.rongwei.bsentity.domain.luckysheet.enummodel;
+package com.rongwei.bsserver.entity.enummodel;
 
 /**
  * @author zhouhang

business-entity/src/main/java/com/rongwei/bsentity/domain/luckysheet/enummodel/OperationTypeEnum.java

@@ -1,4 +1,4 @@
-package com.rongwei.bsentity.domain.luckysheet.enummodel;
+package com.rongwei.bsserver.entity.enummodel;
 
 
 /**

business-entity/src/main/java/com/rongwei/bsentity/domain/luckysheet/enummodel/SheetOperationEnum.java

@@ -1,4 +1,4 @@
-package com.rongwei.bsentity.domain.luckysheet.enummodel;
+package com.rongwei.bsserver.entity.enummodel;
 
 /**
  * 各类操作

business-common/src/main/java/com/rongwei/bscommon/sys/redisserver/GridFileRedisCacheService.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.redisserver;
+package com.rongwei.bsserver.redisserver;
 
 import com.alibaba.fastjson.JSONObject;
 import com.rongwei.bscommon.sys.config.redis.RedisCacheService;

business-common/src/main/java/com/rongwei/bscommon/sys/redisserver/RedisLock.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.redisserver;
+package com.rongwei.bsserver.redisserver;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;

business-server/src/main/java/com/rongwei/bsserver/redisserver/RedisMessageListener.java

@@ -1,8 +1,7 @@
 package com.rongwei.bsserver.redisserver;
 
 import com.google.gson.Gson;
-import com.rongwei.bscommon.sys.redisserver.RedisMessageModel;
-import com.rongwei.bscommon.sys.utils.MyStringUtil;
+import com.rongwei.bsserver.utils.MyStringUtil;
 import com.rongwei.bsserver.websocket.MyWebSocketHandler;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.connection.Message;

business-common/src/main/java/com/rongwei/bscommon/sys/redisserver/RedisMessageModel.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.redisserver;
+package com.rongwei.bsserver.redisserver;
 
 import com.alibaba.fastjson.JSONObject;
 import lombok.Data;

business-common/src/main/java/com/rongwei/bscommon/sys/redisserver/RedisMessagePublish.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.redisserver;
+package com.rongwei.bsserver.redisserver;
 
 import com.google.gson.Gson;
 import lombok.Data;

business-server/src/main/java/com/rongwei/bsserver/service/ConfigerService.java

@@ -1,7 +1,7 @@
 package com.rongwei.bsserver.service;
 
 
-import com.rongwei.bscommon.sys.redisserver.RedisMessagePublish;
+import com.rongwei.bsserver.redisserver.RedisMessagePublish;
 import com.rongwei.bsserver.websocket.WebSocketConfig;
 import com.rongwei.luckysheet.JfGridConfigModel;
 import lombok.extern.slf4j.Slf4j;

business-common/src/main/java/com/rongwei/bscommon/sys/utils/GzipHandle.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.utils;
+package com.rongwei.bsserver.utils;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;

business-common/src/main/java/com/rongwei/bscommon/sys/utils/MyStringUtil.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.utils;
+package com.rongwei.bsserver.utils;
 
 import org.apache.commons.lang3.StringUtils;
 

business-common/src/main/java/com/rongwei/bscommon/sys/utils/MyURLUtil.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.utils;
+package com.rongwei.bsserver.utils;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;

business-common/src/main/java/com/rongwei/bscommon/sys/utils/Pako_GzipUtils.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.utils;
+package com.rongwei.bsserver.utils;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.multipart.MultipartFile;

business-common/src/main/java/com/rongwei/bscommon/sys/utils/TimeUtil.java

@@ -1,4 +1,4 @@
-package com.rongwei.bscommon.sys.utils;
+package com.rongwei.bsserver.utils;
 
 import java.util.Calendar;
 import java.util.Date;

business-server/src/main/java/com/rongwei/bsserver/websocket/MyWebSocketHandler.java

@@ -2,15 +2,15 @@ package com.rongwei.bsserver.websocket;
 
 import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.rongwei.bscommon.sys.db.server.JfGridFileGetService;
-import com.rongwei.bscommon.sys.db.server.JfGridUpdateService;
-import com.rongwei.bscommon.sys.redisserver.GridFileRedisCacheService;
-import com.rongwei.bscommon.sys.redisserver.RedisLock;
-import com.rongwei.bscommon.sys.redisserver.RedisMessageModel;
-import com.rongwei.bscommon.sys.redisserver.RedisMessagePublish;
-import com.rongwei.bscommon.sys.utils.MyStringUtil;
-import com.rongwei.bscommon.sys.utils.MyURLUtil;
-import com.rongwei.bscommon.sys.utils.Pako_GzipUtils;
+import com.rongwei.bsserver.db.server.JfGridFileGetService;
+import com.rongwei.bsserver.db.server.JfGridUpdateService;
+import com.rongwei.bsserver.redisserver.GridFileRedisCacheService;
+import com.rongwei.bsserver.redisserver.RedisLock;
+import com.rongwei.bsserver.redisserver.RedisMessageModel;
+import com.rongwei.bsserver.redisserver.RedisMessagePublish;
+import com.rongwei.bsserver.utils.MyStringUtil;
+import com.rongwei.bsserver.utils.MyURLUtil;
+import com.rongwei.bsserver.utils.Pako_GzipUtils;
 import io.netty.util.internal.StringUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

business-server/src/main/java/com/rongwei/bsserver/websocket/MyWebSocketInterceptor.java

@@ -1,6 +1,6 @@
 package com.rongwei.bsserver.websocket;
 
-import com.rongwei.bscommon.sys.utils.MyURLUtil;
+import com.rongwei.bsserver.utils.MyURLUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;

business-server/src/main/java/com/rongwei/bsserver/websocket/WSUserModel.java

@@ -74,19 +74,19 @@ public class WSUserModel {
      * @param maps
      * @param wm
      */
-    public static void webSocketMapAdd(Hashtable<String,Hashtable<String, WSUserModel>> maps, WSUserModel wm){
+    public static void webSocketMapAdd(Hashtable<String,Hashtable<String,WSUserModel>> maps,WSUserModel wm){
         if(maps.containsKey(wm.getGridKey())){
             maps.get(wm.getGridKey()).put(wm.getId(),wm);
         }else{
-            Hashtable<String, WSUserModel> _map=new Hashtable<String, WSUserModel>();
+            Hashtable<String,WSUserModel> _map=new Hashtable<String,WSUserModel>();
             _map.put(wm.getId(),wm);
             maps.put(wm.getGridKey(),_map);
         }
     }
-    public static void webSocketMapRemove(Hashtable<String,Hashtable<String, WSUserModel>> maps, WSUserModel wm){
+    public static void webSocketMapRemove(Hashtable<String,Hashtable<String,WSUserModel>> maps, WSUserModel wm){
         if(maps.containsKey(wm.getGridKey())){
             if(maps.get(wm.getGridKey())!=null){
-                Hashtable<String, WSUserModel> _map=maps.get(wm.getGridKey());
+                Hashtable<String,WSUserModel> _map=maps.get(wm.getGridKey());
                 if(_map!=null && _map.containsKey(wm.getId())){
                     _map.remove(wm.getId());
                 }

business-server/src/main/resources/bootstrap.yml

@@ -13,6 +13,14 @@ spring:
       max-request-size: 1000MB
   main:
     allow-bean-definition-overriding: true
+  jackson:
+    time-zone: GMT+8
+    date-format: yyyy-MM-dd HH:mm:ss
+  http:
+    encoding:
+      charset: UTF-8
+      enabled: true
+
 server:
   port: 9689
 

business-server/src/main/resources/logback-spring.xml

@@ -4,7 +4,7 @@
     <!--输出到控制台-->
     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%d{HH:mm:ss} [%X{traceId}] [%thread] %-5level %logger{36} - %msg%n</pattern>
+            <pattern>%d{HH:mm:ss} [%X{traceId}] %-5level %logger{36} - %msg%n</pattern>
         </encoder>
     </appender>
 
@@ -18,7 +18,7 @@
         </rollingPolicy>
         <layout class="ch.qos.logback.classic.PatternLayout">
             <Pattern>
-                %d{yyyy-MM-dd HH:mm:ss} [%X{traceId}] [%thread] %-5level -%msg%n
+                %d{yyyy-MM-dd HH:mm:ss} [%X{traceId}] %-5level -%msg%n
             </Pattern>
         </layout>
     </appender>