xiongchao 4 years ago
parent
commit
f800f4e1e1

+ 1 - 0
.idea/compiler.xml

@@ -2,6 +2,7 @@
 <project version="4">
   <component name="CompilerConfiguration">
     <annotationProcessing>
+      <profile default="true" name="Default" enabled="true" />
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />

+ 8 - 2
platform-dao/src/main/java/com/platform/dao/entity/sb/SbInfo.java

@@ -69,6 +69,14 @@ public class SbInfo implements Serializable {
      * 车牌号/房间
      */
     private String cph;
+    /**
+     * 助记码/位置x坐标
+     */
+    private String zjm;
+    /**
+     * 交保单号/位置y坐标
+     */
+    private String jbdh;
     /**
      * 状态
      */
@@ -322,9 +330,7 @@ public class SbInfo implements Serializable {
     private Integer rlType;//燃料类别:需增加数据字典
     private Integer color;//颜色:需增加数据字典
     private Integer seatNumber;//座位数
-    private String zjm;//助记码
     private LocalDate spDate;//上牌日期
-    private String jbdh;//交保单号
     private String sbdh;//商保单号
     private LocalDate jbdDate;//交保到期日
     private LocalDate sbdDate;//商报到期日

+ 4 - 4
platform-dao/src/main/resources/application-daoProd.yml

@@ -3,9 +3,9 @@ spring:
     druid:
       master:
         driver-class-name: com.mysql.cj.jdbc.Driver
-        url: jdbc:mysql://139.159.196.89:33306/qykh_sb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&allowMultiQueries=true
+        url: jdbc:mysql://192.168.0.54:3306/hitch-sb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&allowMultiQueries=true
         username: root
-        password: qykh@CQDWJS@!123
+        password: RL_love_hwy_MYSQL_123
         filters: wall,stat
         filter:
           stat:
@@ -32,9 +32,9 @@ spring:
         validation-query: SELECT 'x'
       slave:
         driver-class-name: com.mysql.cj.jdbc.Driver
-        url: jdbc:mysql://139.159.196.89:33306/qykh_sb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&allowMultiQueries=true
+        url: jdbc:mysql://192.168.0.54:3306/hitch-sb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&allowMultiQueries=true
         username: root
-        password: qykh@CQDWJS@!123
+        password: RL_love_hwy_MYSQL_123
         filters: wall,stat
         filter:
           stat:

+ 1 - 1
platform-rest/src/main/resources/application-prod.yml

@@ -18,7 +18,7 @@ spring:
     name: platform-rest
   redis:
     password:
-    port: 6397
+    port: 6379
     host: localhost
     database: 1
     jpa:

+ 11 - 0
platform-service/src/main/java/com/platform/service/sb/impl/SbInfoServiceImpl.java

@@ -99,6 +99,12 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
 
     private final SysDeptRelationService sysDeptRelationService;
 
+    private final String useArea = "5e64ac691c527828b2114da0";
+    private final String useCompany = "6063f905eb190003685af6d4";
+    private final String useProject = "6063f92ceb190003685af6d9";
+    private final String useDept = "606540afeb19002808e276d1";
+    private final String useGroup = "606540c8eb19002808e276d8";
+
     @Override
     public int batchDelete(List<String> ids) {
         Weekend<SbInfo> weekend = new Weekend<>(SbInfo.class);
@@ -155,6 +161,11 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
             model.setNo(IdGeneratorUtils.getSbNo(++count));
         }
 
+        model.setUseArea(useArea);
+        model.setUseCompany(useCompany);
+        model.setUseProject(useProject);
+        model.setUseDept(useDept);
+        model.setUseGroup(useGroup);
        /* SbModelVO sbModelVO = sbModelMapper.getById(model.getModelId());
         if (sbModelVO == null) {
             throw new BusinessException("找不到型号,modelID: " + model.getModelId());