lrl 2021-09-07

src/main/java/com/steerinfo/ems/tcm0310/controller/TCm0310Controller.java

@@ -1,6 +1,7 @@
 package com.steerinfo.ems.tcm0310.controller;
 
 import com.steerinfo.auth.utils.JwtUtil;
+import com.steerinfo.ems.tcm0310.mapper.TCm0310Mapper;
 import com.steerinfo.ems.tcm0310.model.TCm0310;
 import com.steerinfo.ems.tcm0310.service.ITCm0310Service;
 import com.steerinfo.ems.tcm0312.service.ITCm0312Service;
@@ -43,6 +44,8 @@ public class TCm0310Controller extends BaseRESTfulController {
     ITCm0310Service tCm0310Service;
     @Autowired
     ITCm0312Service tCm0312Service;
+    @Autowired
+    TCm0310Mapper tCm0310Mapper;
 
     @ApiOperation(value="获取列表", notes="分页查询")
     @ApiImplicitParams({
@@ -71,49 +74,29 @@ public class TCm0310Controller extends BaseRESTfulController {
         return success(tCm0310);
     }
 
-    @ApiOperation(value="更新详细信息", notes="根据主键watercode来指定更新对象，并根据传过来的tCm0310信息来更新详细信息")
-    @ApiImplicitParam(name = "tCm0310", value = "详细实体tCm0310", required = true, dataType = "TCm0310")
-    @PutMapping(value = "/")
-    public RESTfulResult update(@RequestBody TCm0310 model){
-        if(model.getWatercode() == null || model.getWatercode().isEmpty()){
-            return failed(null, "请传入主键参数:watercode");
-        }
-        else {
-            LOGGER.info("水质系统维护修改前的数据是" + tCm0310Service.getById(model.getWatercode()).toString());
-            model.setUpdateman(JwtUtil.getUseridByToken());
-            TCm0310 tCm0310 = tCm0310Service.modify(model);
-            LOGGER.info("水质系统维护修改后的数据是" + tCm0310.toString());
-            return success(tCm0310);
-        }
-    }
+//    @ApiOperation(value="更新详细信息", notes="根据主键watercode来指定更新对象，并根据传过来的tCm0310信息来更新详细信息")
+//    @ApiImplicitParam(name = "tCm0310", value = "详细实体tCm0310", required = true, dataType = "TCm0310")
+//    @PutMapping(value = "/")
+//    public RESTfulResult update(@RequestBody TCm0310 model){
+//        if(model.getWatercode() == null || model.getWatercode().isEmpty()){
+//            return failed(null, "请传入主键参数:watercode");
+//        }
+//        else {
+//            LOGGER.info("水质系统维护修改前的数据是" + tCm0310Service.getById(model.getWatercode()).toString());
+//            model.setUpdateman(JwtUtil.getUseridByToken());
+//            TCm0310 tCm0310 = tCm0310Service.modify(model);
+//            LOGGER.info("水质系统维护修改后的数据是" + tCm0310.toString());
+//            return success(tCm0310);
+//        }
+//    }
 
     @ApiOperation(value="删除", notes="根据主键watercode来指定删除对象")
     @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
-    @DeleteMapping(value = "/{id}")
+    @DeleteMapping( produces  = "application/json;charset=UTF-8")
     //@RequiresPermissions("tcm0310:delete")
-    public RESTfulResult delete(@PathVariable String id) {
-        String[] array = id.split(",");
-        int failnum = 0;
-        String failmsg = "";
-        for (int i = 0; i < array.length; i++) {
-            if(tCm0312Service.queryByProperty("systemname", array[i]).size() != 0){
-                LOGGER.error("水质系统维护在删除第" + (i + 1) + "条数据时出现问题，id是" + array[i] + "原因是在T_CM_0312表存在关系。");
-                failnum++;
-                failmsg += array[i] + "在水质监测计划制定维护界面存在关系，请先删除对应关系！";
-                continue;
-            }
-            if(tCm0310Service.getById(array[i]) == null){
-                LOGGER.error("水质系统维护在删除第" + (i + 1) + "条数据时出现问题，水质系统维护不存在该" + array[i]);
-                failnum++;
-                failmsg += System.getProperty("line.separator") +"水质系统维护不存在该" + array[i];
-                continue;
-            }
-            LOGGER.info("水质系统维护要删除的第" + (i + 1) + "条数据是" + tCm0310Service.getById(array[i]).toString());
-            tCm0310Service.delete(array[i]);
-        }
-        if(failnum > 0){
-            LOGGER.info(JwtUtil.getUseridByToken() + "本次共删除" + array.length + "条数据,其中成功" + (array.length - failnum) + "条,失败" + failnum + "条,失败的数据id:" + failmsg);
-            return success(51,"本次共删除" + array.length + "条数据,其中成功" + (array.length - failnum) + "条,失败" + failnum + "条,失败原因：" + failmsg);
+    public RESTfulResult delete(@RequestBody TCm0310[] models) {
+        for (TCm0310 model : models) {
+            tCm0310Mapper.deleteByPrimaryKey(model.getWatercode());
         }
         return success();
     }

src/main/resources/application.properties

@@ -0,0 +1,108 @@
+server.port=${SERVER_PORT:8086}
+#\u5FAE\u670D\u52A1\u7AEF\u53E3
+spring.jmx.default-domain=ems
+#\u6307\u5B9A\u7248\u672C
+api.version=v1
+#\u6307\u5B9Aencoding\u683C\u5F0F
+server.tomcat.uri-encoding=UTF-8
+
+# \u5B9A\u4E49swagger2\u5305\u8DEF\u5F84
+swagger2.enable=true
+swagger2.basepackage=com.steerinfo
+
+#\u542F\u7528shutdown
+# endpoints.shutdown.enabled=true
+#\u7981\u7528\u5BC6\u7801\u9A8C\u8BC1
+# endpoints.shutdown.sensitive=false
+
+#7*24*60*60*1000
+access.token.ttl=604800000
+#3*7*24*60*60*1000
+refresh.token.ttl=1814400000
+#;/${api.version}/sys/**/export;/${api.version}/sys/**/import;/**,auth
+# \u62E6\u622A\u5668\u9644\u52A0\u914D\u7F6E\uFF1A\u6BCF\u4E2Aurl\u8DEF\u5F84\u4EE5;\u5206\u9694\uFF1Burl\u7684\u9017\u53F7\u540Eauth\u8868\u793A\u9700\u8981\u8BA4\u8BC1\u540E\u624D\u80FD\u8BBF\u95EE\uFF0C\u6CA1\u6709\u6216\u8005anon\u8868\u793A\u4E0D\u6821\u9A8C
+shiro.chains=/auth/login/**;/ktr/;/${api.version}/sys/**/export;/${api.version}/syspromachineauths/verify**;/${api.version}/sys/**/import;/**,auth
+# \u62E6\u622A\u5668\u9644\u52A0\u914D\u7F6E\uFF1A\u6BCF\u4E2Aurl\u8DEF\u5F84\u4EE5;\u5206\u9694\uFF1Burl\u7684\u9017\u53F7\u540Eauth\u8868\u793A\u8BA4\u8BC1\u540E\u624D\u80FD\u8BBF\u95EE\uFF0C\u6CA1\u6709\u6216\u8005anon\u8868\u793A\u4E0D\u6821\u9A8C
+shiro.chains.append=/swagger**;/idmg/**;/ktr/;/${api.version}/sysposts/list/user**;/webjars/**;/v2/api**;/images/**;/configuration/**;
+
+# Redis\u7F13\u5B58\u914D\u7F6E
+cache.level=2
+#Redis\u7F13\u5B58\u914D\u7F6E
+redis.host=172.16.90.238
+redis.port=6379
+redis.pwd=123456
+redis.project.prefix=slts
+redis.pool.maxTotal=8
+redis.pool.maxWaitMillis=1000
+redis.pool.maxIdle=4
+redis.cache.time=864000000
+redis.database=0
+
+#mq
+spring.rabbitmq.host=172.16.90.238
+spring.rabbitmq.port=8084 
+spring.rabbitmq.username=admin
+spring.rabbitmq.password=123456
+
+#\u65E5\u5FD7 purchase
+#\u652F\u6301\u9AD8\u4EAE\u8F93\u51FA
+spring.output.ansi.enabled=ALWAYS
+spring.main.show-banner=false
+logging.level.com.steer=DEBUG
+
+#\u56FD\u9645\u5316
+spring.messages.basename=message
+spring.messages.encoding=UTF-8
+
+management.health.mail.enabled=false
+# MyBatis \u914D\u7F6E
+mybatis.mapper-locations=classpath*:com/hnshituo/mapper/*.xml
+###spring boot\u81EA\u52A8\u914D\u7F6E\u5355\u6570\u636E\u6E90###
+#spring.datasource.url=jdbc:oracle:thin:@192.168.1.160:1521:orcl
+#spring.datasource.username=sale
+#spring.datasource.password=oracle
+
+#\u591A\u6570\u636E\u6E90\u914D\u7F6E
+#master
+multiple.datasource.master.driver-class-name=oracle.jdbc.driver.OracleDriver
+multiple.datasource.master.url=jdbc:oracle:thin:@172.16.90.227:1521/emsdb
+multiple.datasource.master.username=ems
+multiple.datasource.master.password=ems@2021
+multiple.datasource.master.initial-size=3
+multiple.datasource.master.min-idle=3
+multiple.datasource.master.maxActive=10
+multiple.datasource.master.maxWait=60000
+multiple.datasource.master.timeBetweenEvictionRunsMillis=60000
+multiple.datasource.master.minEvictableIdleTimeMillis=300000
+
+#slave1
+multiple.datasource.slave1.driver-class-name=
+multiple.datasource.slave1.url=
+multiple.datasource.slave1.username=
+multiple.datasource.slave1.password=
+#slave2
+multiple.datasource.slave2.driver-class-name=
+multiple.datasource.slave2.url=
+multiple.datasource.slave2.username=
+multiple.datasource.slave2.password=
+#other
+multiple.datasource.other.driver-class-name=com.microsoft.sqlserver.jdbc.SQLServerDriver
+multiple.datasource.other.url= jdbc:sqlserver://47.114.7.173:1433;database=Meter_Base
+multiple.datasource.other.username=mb
+multiple.datasource.other.password=mb@8888
+
+#ftp
+custom.config.file-server.ip= 192.168.3.49
+custom.config.file-server.port= 21
+custom.config.file-ftp-user= ATEMSFTP
+custom.config.file-ftp-password= 123456
+
+web.upload-path=/static/
+genxml.pth=/genxml/
+spring.http.encoding.force=true
+spring.mvc.static-path-pattern=/**
+spring.resources.static-locations=classpath:/META-INF/resources/,classpath:/resources/,\
+  classpath:/static/,classpath:/genxml/,classpath:/public/,file:${web.upload-path},file:${genxml.pth}
+
+#\uFFFD\u013C\uFFFD\u00B7\uFFFD\uFFFD
+web.apk-path=data/lims/test/