Merge branch 'master' of http://175.178.86.109:3000/ljf/shuili

# Conflicts:
#	shuili-common/pom.xml

shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java

@@ -66,7 +66,7 @@ public class SysXzqhController extends BaseController {
         SysUser user = UserUtils.getUser();
         String deptId = user.getDeptId();
         SysDept sysDept = sysDeptService.getById(deptId);
-        String xzqhId = sysDept.getXzqhId();
+        String xzqhId = sysDept.getXzqhId().substring(0,6);
         SysXzqh xzqh = sysXzqhService.getById(xzqhId);
         String userName = user.getUserName();
         /*if (userName.equals("admin")) {

shuili-admin/src/main/java/com/kms/web/synchronous/YgSynchronous.java

@@ -18,14 +18,8 @@ import com.kms.yg.sk.domain.AttResBase;
 import com.kms.yg.sk.domain.AttResRspp;
 import com.kms.yg.sk.service.AttResBaseService;
 import com.kms.yg.sk.service.AttResRsppService;
-import com.kms.yg.sz.domain.BsSgcSzCxjl;
+import com.kms.yg.sz.domain.*;
-import com.kms.yg.sz.domain.BsSgcSzGcjg;
+import com.kms.yg.sz.service.*;
-import com.kms.yg.sz.domain.BsSgcSzSafeJbxx;
-import com.kms.yg.sz.domain.BsSgcSzSwtz;
-import com.kms.yg.sz.service.BsSgcSzCxjlService;
-import com.kms.yg.sz.service.BsSgcSzGcjgService;
-import com.kms.yg.sz.service.BsSgcSzSafeJbxxService;
-import com.kms.yg.sz.service.BsSgcSzSwtzService;
 import com.kms.yg.xgxd.domain.AttDpdsBase;
 import com.kms.yg.xgxd.service.AttDpdsBaseService;
 import com.shuili.common.utils.password.MD5Util;
@@ -389,13 +383,18 @@ public class YgSynchronous {
      * 水闸编码
      */
     @GetMapping("dawc")
-    @Scheduled(cron = "0 0 0 * * ?")
+    @Scheduled(initialDelay = 0, fixedRate = Long.MAX_VALUE)
     public void dawc(){
         int pageNum = 1;
-        int pageSize = 99999;
+        int pageSize = 99999999;
         String s = sendRequest( dawc+ "?pageNum=" + pageNum + "&pageSize=" + pageSize);
         String data = JSONObject.parseObject(s).getString("data");
-
+        List<AttWagaCode> codeList = JSONObject.parseArray(data, AttWagaCode.class);
+        for (AttWagaCode attWagaCode : codeList) {
+            attWagaCode.preInsert();
+            attWagaCode.setId(attWagaCode.getWagaCode());
+            attWagaCodeService.saveOrUpdate(attWagaCode);
+        }
     }
 
     @Autowired
@@ -408,6 +407,8 @@ public class YgSynchronous {
     BsSgcDfJyjlService bsSgcDfJyjlService;
     @Autowired
     BsSgcDfGcxyService bsSgcDfGcxyService;
+    @Autowired
+    AttWagaCodeService attWagaCodeService;
 
     /**
      * 水闸水文特征

shuili-common/pom.xml

@@ -13,6 +13,18 @@
     <packaging>jar</packaging>
     <description>boot 工程工具类 </description>
 
+    <properties>
+        <bitwalker.version>1.21</bitwalker.version>
+        <fastjson.version>1.2.79</fastjson.version>
+        <commons.io.version>2.11.0</commons.io.version>
+        <commons.fileupload.version>1.4</commons.fileupload.version>
+        <commons-lang3.version>3.12.0</commons-lang3.version>
+        <servlet-api.version>4.0.1</servlet-api.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
+
     <dependencies>
 
         <!--csv文件操作-->
@@ -47,6 +59,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
+            <version>${servlet-api.version}</version>
         </dependency>
 
         <dependency>
@@ -66,23 +79,27 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
+            <version>2.13.2</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
+            <version>${commons-lang3.version}</version>
         </dependency>
 
         <!--文件上传工具类 -->
         <dependency>
             <groupId>commons-fileupload</groupId>
             <artifactId>commons-fileupload</artifactId>
+            <version>${commons.fileupload.version}</version>
         </dependency>
 
         <!--io常用工具类 -->
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
+            <version>${commons.io.version}</version>
         </dependency>
 
 
@@ -90,16 +107,22 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
+            <version>${fastjson.version}</version>
         </dependency>
 
+
+
         <!-- 解析客户端操作系统、浏览器等 -->
         <dependency>
             <groupId>eu.bitwalker</groupId>
             <artifactId>UserAgentUtils</artifactId>
+            <version>${bitwalker.version}</version>
         </dependency>
 
-    </dependencies>
 
+
+
+    </dependencies>
     <build>
         <finalName>${project.artifactId}</finalName>
     </build>

shuili-system/src/main/java/com/kms/yg/sz/domain/AttWagaCode.java

@@ -0,0 +1,24 @@
+package com.kms.yg.sz.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.shuili.common.core.domain.BaseEntity;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@TableName("att_waga_code")
+public class AttWagaCode extends BaseEntity {
+
+    private String wagaCode;
+
+    private String wagaCode2;
+
+    private String wagaCode3;
+
+    private String note;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date updateDate;
+}

shuili-system/src/main/java/com/kms/yg/sz/mapper/AttWagaCodeMapper.java

@@ -0,0 +1,11 @@
+package com.kms.yg.sz.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kms.yg.sz.domain.AttWagaCode;
+import com.kms.yg.sz.domain.BsSgcSzAqjc;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface AttWagaCodeMapper extends BaseMapper<AttWagaCode> {
+}

shuili-system/src/main/java/com/kms/yg/sz/service/AttWagaCodeService.java

@@ -0,0 +1,11 @@
+package com.kms.yg.sz.service;
+
+import com.kms.yg.sz.domain.AttWagaCode;
+
+import com.kms.yg.sz.mapper.AttWagaCodeMapper;
+import com.shuili.common.core.service.BaseService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class AttWagaCodeService extends BaseService<AttWagaCodeMapper, AttWagaCode> {
+}