Merge branch 'master' of https://gitee.com/antai-wuliu/ANTAI-API

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.example</groupId>
     <artifactId>antai-api</artifactId>
-    <version>1.1</version>
+    <version>1.0</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>

src/main/java/com/steerinfo/dil/controller/AMScontroller.java

@@ -572,4 +572,14 @@ public class AMScontroller {
                                   Integer pageSize) {
         return amsFeign.getMaterial(prodCode, apiId, pageNum, pageSize);
     }
+
+    @ApiOperation(value = "批量生产需求状态修改接口", notes = "生产需求状态修改接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @PostMapping(value = "/productionRequirementChanges/{id}")
+    @LogAround(foreignKeys = {"transRequirementId"}, foreignKeyTypes = {"生产需求"})
+    public Map<String, Object> productionRequirementChanges(@PathVariable String id,@RequestBody(required = false) Map<String, Object> map) {
+        return amsFeign.productionRequirementChanges(id,map);
+    }
 }

src/main/java/com/steerinfo/dil/controller/EMSController.java

@@ -43,16 +43,17 @@ public class EMSController extends BaseRESTfulController {
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @LogAround(foreignKeys = {"settlementId"}, foreignKeyTypes = {"新增详单明细"})
     @PostMapping("/emsdetailsordersAdd")
-    public Map<String, Object> emsdetailsordersAdd(@RequestBody(required = false) Map<String, Object> map){
+    public Map<String, Object> emsdetailsordersAdd(@RequestBody(required = false) Map<String, Object> map) {
 
         return emsFeign.emsdetailsordersAdd(map);
     }
 
+
     @ApiOperation(value = "新增账单明细")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @LogAround(foreignKeys = {"settlementId"}, foreignKeyTypes = {"新增详单明细"})
     @PostMapping("/emssettlementordersAdd")
-    public Map<String, Object> emssettlementordersAdd(@RequestBody Map<String, Object> map){
+    public Map<String, Object> emssettlementordersAdd(@RequestBody Map<String, Object> map) {
         return emsFeign.emssettlementordersAdd(map);
     }
 
@@ -60,18 +61,18 @@ public class EMSController extends BaseRESTfulController {
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @LogAround(foreignKeys = {"settlementId"}, foreignKeyTypes = {"新增详单明细"})
     @PutMapping("/emsdetailsordersupdate/{id}")
-    public Map<String, Object> emsdetailsordersupdate(@PathVariable BigDecimal id,@RequestBody(required = false) Map<String, Object> map){
+    public Map<String, Object> emsdetailsordersupdate(@PathVariable BigDecimal id, @RequestBody(required = false) Map<String, Object> map) {
         map.put("updateUsername", map.get("userName").toString());
-        return emsFeign.emsdetailsordersdelete(id,map);
+        return emsFeign.emsdetailsordersupdate(id, map);
     }
 
     @ApiOperation(value = "更新详单状态")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @LogAround(foreignKeys = {"settlementId"}, foreignKeyTypes = {"新增详单明细"})
     @PutMapping("/emsdetailsordersdelete/{id}")
-    public Map<String, Object> emsdetailsordersdelete(@PathVariable BigDecimal id,@RequestBody(required = false) Map<String, Object> map){
+    public Map<String, Object> emsdetailsordersdelete(@PathVariable BigDecimal id, @RequestBody(required = false) Map<String, Object> map) {
         map.put("updateUsername", map.get("userName").toString());
-        return emsFeign.emsdetailsordersupdate(id,map);
+        return emsFeign.emsdetailsordersdelete(id, map);
     }
 
     @ApiOperation(value = "展示账单详情")
@@ -83,9 +84,9 @@ public class EMSController extends BaseRESTfulController {
     })
     @PostMapping(value = "/emssettlementordersList")
     Map<String, Object> emssettlementordersList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                             Integer apiId,
-                                             Integer pageNum,
-                                             Integer pageSize
+                                                Integer apiId,
+                                                Integer pageNum,
+                                                Integer pageSize
     ) {
         return emsFeign.emssettlementordersList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
     }
@@ -111,21 +112,67 @@ public class EMSController extends BaseRESTfulController {
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @LogAround(foreignKeys = {"settlementId"}, foreignKeyTypes = {"账单详情更新"})
     @PutMapping("/emssettlementorderupdate/{id}")
-    public Map<String, Object> emssettlementorderupdate(@PathVariable BigDecimal id,@RequestBody(required = false) Map<String, Object> map) throws ParseException {
+    public Map<String, Object> emssettlementorderupdate(@PathVariable BigDecimal id, @RequestBody(required = false) Map<String, Object> map) throws ParseException {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-        Date settlementStartDate = simpleDateFormat.parse(map.get("settlementStartDate").toString());
-        Date settlementEndDate = simpleDateFormat.parse(map.get("settlementEndDate").toString());
-        map.put("settlementStartDate",settlementStartDate);
-        map.put("settlementEndDate",settlementEndDate);
-        return emsFeign.emssettlementorderupdate(id,map);
+        if (map.containsKey("settlementStartDate")) {
+            Date settlementStartDate = simpleDateFormat.parse(map.get("settlementStartDate").toString());
+            map.put("settlementStartDate", settlementStartDate);
+        }
+        if (map.containsKey("settlementEndDate")) {
+            Date settlementEndDate = simpleDateFormat.parse(map.get("settlementEndDate").toString());
+
+            map.put("settlementEndDate", settlementEndDate);
+        }
+
+
+        return emsFeign.emssettlementorderupdate(id, map);
     }
 
     @ApiOperation(value = "异常处理")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @LogAround(foreignKeys = {"settlementId"}, foreignKeyTypes = {"异常处理"})
     @PostMapping("/abnormal")
-    public Map<String, Object> abnormal(@RequestBody(required = false) Map<String, Object> map){
+    public Map<String, Object> abnormal(@RequestBody(required = false) Map<String, Object> map) {
         return emsFeign.abnormal(map);
     }
+    @ApiOperation(value = "展示工资绩效")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping(value = "/emssalarydetailsList")
+    Map<String, Object> emssalarydetailsList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                             Integer apiId,
+                                             Integer pageNum,
+                                             Integer pageSize
+    ) {
+        return emsFeign.emsdetailsordersList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    }
+
+    @ApiOperation(value = "新增详单明细")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @LogAround(foreignKeys = {"settlementId"}, foreignKeyTypes = {"新增详单明细"})
+    @PostMapping("/emsdetailsordersAdd2")
+    public Map<String, Object> emsdetailsordersAdd2(@RequestBody(required = false) Map<String, Object> map) {
+
+        return emsFeign.emsdetailsordersAdd2(map);
+    }
+
+    @ApiOperation(value = "详单审批")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @LogAround(foreignKeys = {"settlementId"}, foreignKeyTypes = {"新增详单明细"})
+    @PutMapping("/emsdetailsordersapprove/{id}")
+    public Map<String, Object> emsdetailsordersapprove(@PathVariable String id, @RequestBody(required = false) Map<String, Object> map) {
+        return emsFeign.emsdetailsordersapprove(id, map);
+    }
+
+    @ApiOperation(value = "获取异常数据总数")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PostMapping("/faildMsg")
+    public Map<String, Object> faildMsg() {
+        return emsFeign.faildMsg();
+    }
 
 }

src/main/java/com/steerinfo/dil/controller/RMScontroller.java

@@ -1170,10 +1170,29 @@ public class RMScontroller extends BaseRESTfulController {
         map.put("insertUsername", map.get("userName").toString());
         return  rmsFeign.insertBusinessType(map);
     }
+   @ApiOperation(value = "审批流程")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping(value = "/getapprovelines")
+    public Map<String, Object> getrmsapprovelines(@RequestBody(required = false) Map<String, Object> mapValue,
+                                           Integer pageNum,
+                                           Integer pageSize,
+                                           Integer apiId) {
+        return rmsFeign.getrmsapprovelines(mapValue == null ? new HashMap<>() : mapValue, pageNum, pageSize, apiId);
+    }
 
-
-
-    @ApiOperation(value = "燃料类型")
+    @ApiOperation(value="新增审批流程")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @LogAround(foreignKeys = {"categoryId"},foreignKeyTypes = {"业务类型"})
+    @PostMapping("/addapprovelines")
+    public  Map<String, Object> addapprovelines(@RequestBody(required = false) Map<String, Object> map) {
+        return  rmsFeign.addapprovelines(map);
+    }
+ @ApiOperation(value = "燃料类型")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "map", value = "参数", required = false, dataType = "map"),
             @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
@@ -1203,5 +1222,4 @@ public class RMScontroller extends BaseRESTfulController {
     public Map<String, Object> deleteFuelType(@RequestBody(required = false) Map<String, Object> map) {
         return rmsFeign.deleteFuelType(map);
     }
-
-}
+}}

src/main/java/com/steerinfo/dil/controller/SystemFileController.java

@@ -52,9 +52,11 @@ public class SystemFileController extends BaseRESTfulController {
     @Resource
     SystemFileMapper systemFileMapper;
 
+
     @Autowired
     private FtpFileUtil ftpFileUtil;
-//同一个信息包含多个上传文件信息
+
+    //同一个信息包含多个上传文件信息
     @PostMapping("/insertFile")
     public RESTfulResult insertFile(String fileuuid, @ModelAttribute MultipartFile[] file) {
         String filenames = "";
@@ -103,12 +105,14 @@ public class SystemFileController extends BaseRESTfulController {
     }
 
     @PostMapping("/insertFiles2")
-    public RESTfulResult insertFiles2(String[] fileuuid, @ModelAttribute MultipartFile[] file) {
+    public RESTfulResult insertFiles2(String fileuuid, @ModelAttribute MultipartFile[] file) {
         String filenames = "";
         for (int i = 0; i < file.length; i++) {
             filenames += file[i].getOriginalFilename() + ";";
         }
         String filesid = "";
+
+        String[] fileuuids = fileuuid.split(",");
         if (file != null) {
             for (int i = 0; i < file.length; i++) {
                 try {
@@ -129,7 +133,7 @@ public class SystemFileController extends BaseRESTfulController {
                         SystemFile uploadFile = new SystemFile();
                         uploadFile.setFilename(oldName);
                         uploadFile.setFilepath(filePath + "/" + newName);
-                        uploadFile.setId(fileuuid[i]);
+                        uploadFile.setId(fileuuids[i]);
                         SystemFile modela = systemFileService.add(uploadFile);
                         if (modela != null) {
                             filesid += "," + modela.getId();
@@ -148,8 +152,10 @@ public class SystemFileController extends BaseRESTfulController {
         }
 
     }
+
     @PostMapping("/insertFiles")
-    public RESTfulResult insertFiles(String[] fileUuids,String[] fileNames,String[]fileTypes, Map<Object,MultipartFile>FileList, MultipartRequest request) throws Exception {
+    public RESTfulResult insertFiles(String[] fileUuids, String[] fileNames, String[] fileTypes, Map<Object, MultipartFile> FileList, MultipartRequest request) throws Exception {
+
 
         List<MultipartFile> files  = new ArrayList<>();
         int index=-1;
@@ -177,11 +183,11 @@ public class SystemFileController extends BaseRESTfulController {
             String newName = IDutils.getImageName();
             //重新命名文件
 
-            String filePath = simpleDateFormat.format(new Date())+"/"+fileTypes[i].toString();
+            String filePath = simpleDateFormat.format(new Date()) + "/" + fileTypes[i].toString();
             //获取输入流
             String fileTypeName = files.get(i).getOriginalFilename();
-            fileTypeName=fileTypeName.substring(fileTypeName.lastIndexOf(".")) ;
-            newName = oldName+"("+newName+")" +fileTypeName;
+            fileTypeName = fileTypeName.substring(fileTypeName.lastIndexOf("."));
+            newName = oldName + "(" + newName + ")" + fileTypeName;
             InputStream inputStream = files.get(i).getInputStream();
             boolean result = ftpFileUtil.uploadToFtp(inputStream, filePath, newName, false);
             inputStream.close();
@@ -199,7 +205,7 @@ public class SystemFileController extends BaseRESTfulController {
             }
         }
 
-       return success();
+        return success();
 
     }
 
@@ -207,10 +213,10 @@ public class SystemFileController extends BaseRESTfulController {
     public RESTfulResult previewfile(@RequestBody HashMap parmas) {
         String filename = parmas.get("filename").toString();
         String filepath = parmas.get("filepath").toString();
-        if (filename == null ||filename.isEmpty()) {
+        if (filename == null || filename.isEmpty()) {
             return failed("该图片不存在！");
         }
-        if (filepath == null ||filepath.isEmpty()) {
+        if (filepath == null || filepath.isEmpty()) {
             return failed("该图片地址不存在！");
         }
         try {
@@ -222,6 +228,29 @@ public class SystemFileController extends BaseRESTfulController {
         }
     }
 
+    @PostMapping("/previewfile2")
+    public RESTfulResult previewfile2(@RequestBody HashMap parmas) {
+
+        SystemFile value = systemFileMapper.selectByPrimaryKey(parmas.get("id").toString());
+
+            String fileName = value.getFilename();
+            String filepath = value.getFilepath();
+            if (fileName == null || fileName.isEmpty()) {
+                return failed("该图片不存在！");
+            }
+            if (filepath == null || filepath.isEmpty()) {
+                return failed("该图片地址不存在！");
+            }
+
+            try {
+                String result = ftpFileUtil.downloadFile(fileName, filepath);
+                return success(result);
+            } catch (IOException e) {
+                e.getMessage();
+                return failed();
+            }
+
+    }
 
     @PostMapping("/updateFile")
     public RESTfulResult updateFile(String alternateFields1, @ModelAttribute MultipartFile[] file) {

src/main/java/com/steerinfo/dil/controller/TMSController.java

@@ -160,6 +160,8 @@ public class TMSController extends BaseRESTfulController {
         return tmsFeign.syncWeightResult(map);
     }
 
+
+
     @ApiOperation(value="计时")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @RequestLimit()

src/main/java/com/steerinfo/dil/feign/AmsFeign.java

@@ -203,4 +203,7 @@ public interface AmsFeign {
                               @RequestParam Integer pageNum,
                               @RequestParam Integer pageSize);
 
+    @PostMapping(value = "api/v1/ams/amstransrequirements/productionRequirementChanges/{id}")
+    Map<String, Object> productionRequirementChanges(@PathVariable String id,@RequestBody Map<String, Object> map);
+
 }

src/main/java/com/steerinfo/dil/feign/EmsFeign.java

@@ -47,6 +47,21 @@ public interface EmsFeign {
                                              @RequestParam Integer pageNum,
                                              @RequestParam Integer pageSize
     );
+    @PostMapping("api/v1/ems/emssalarydetailss/emssalarydetailsList")
+    Map<String, Object> emssalarydetailsList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                             @RequestParam Integer apiId,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize
+    );
+
+    @PostMapping("api/v1/ems/emsdetailsorders/emsdetailsordersAdd2")
+    Map<String, Object> emsdetailsordersAdd2(@RequestBody(required = false) Map<String, Object> map);
+
+    @PutMapping("api/v1/ems/emsdetailsorders/emsdetailsordersapprove/{id}")
+    Map<String, Object> emsdetailsordersapprove(@PathVariable String id,@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/ems/emsdetailsorders/faildMsg")
+    Map<String, Object> faildMsg();
 }
 
 

src/main/java/com/steerinfo/dil/feign/RmsFeign.java

@@ -657,6 +657,13 @@ public interface RmsFeign {
     @PostMapping("api/v1/rms/dilbusinesstypes/insertBusinessType")
     Map<String, Object> insertBusinessType(@RequestBody(required = false) Map<String, Object> map);
 
+    @PostMapping("/api/v1/rms/rmsapprovelines/getapprovelines")
+    Map<String, Object> getrmsapprovelines(@RequestBody(required = false) Map<String, Object> mapValue, @RequestParam Integer pageNum,
+                                        @RequestParam Integer pageSize,
+                                        @RequestParam Integer apiId);
+    @PostMapping("api/v1/rms/rmsapprovelines/addapprovelines")
+    Map<String, Object> addapprovelines(@RequestBody(required = false) Map<String, Object> map);
+
     //燃料类型
     @PostMapping(value = "api/v1/rms/rmsfueltypes/getFuelTypeList")
     Map<String, Object> getFuelTypeList(@RequestBody(required = false) Map<String, Object> mapValue,

src/main/java/com/steerinfo/dil/feign/TmsFeign.java

@@ -74,24 +74,23 @@ public interface TmsFeign {
 
 
     @PostMapping("api/v1/tms/tmstimingresults/tmstimingresultsList")
+
     Map<String, Object> tmstimingresultsList(@RequestBody(required = false) Map<String, Object> map,
                                              @RequestParam Integer apiId,
                                              @RequestParam Integer pageNum,
                                              @RequestParam Integer pageSize);
 
-
     @PostMapping("api/v1/tms/omstransorders/saleDispatchOrder")
     Map<String, Object> saleDispatchOrder(@RequestBody(required = false) Map<String, Object> map);
 
     @PostMapping("api/v1/tms/omstransorders/getSaleTransOrderList")
-    Map<String, Object> getSaleTransOrderList(@RequestBody(required = false) Map<String, Object> map,
-                                          @RequestParam  Integer apiId,
-                                          @RequestParam  Integer pageNum,
-                                          @RequestParam  Integer pageSize);
+    Map<String, Object> getSaleTransOrderList(@RequestBody(required = false) Map<String, Object> map,  @RequestParam Integer apiId,
+                                              @RequestParam Integer pageNum,
+                                              @RequestParam Integer pageSiz);
 
 
     @PostMapping("api/v1/tms/tmsqualityresults/syncQualityResult")
-    Map<String, Object> syncQualityResult(Map<String, Object> map);
+    Map<String, Object> syncQualityResult(@RequestBody(required = false) Map<String, Object> map);
 
     @PostMapping("api/v1/tms/tmssigninresults/signIn")
     Map<String, Object> signIn(Map<String, Object> map);

src/main/resources/application-dev.yml

@@ -51,7 +51,7 @@ openfeign:
   OMSFeign:
     url: ${OMSFEIGN_URL:localhost:8095}
   RmsFeign:
-    url: ${RMSFEIGN_URL:172.16.90.214:8060}
+    url: ${RMSFEIGN_URL:localhost:8060}
   IntegrationFeign:
     url: ${INTEGRATIONFEIGN_URL:localhost:8066}
   OTMSFeign:
@@ -70,7 +70,7 @@ feign:
     config:
       default:  #默认配置,连接时间要短，读取时间要长
         connectTimeout: 1000 #单位毫秒
-        readTimeout: 100000 #单位毫秒
+        readTimeout: 150000 #单位毫秒
 #熔断器
 hystrix:
   command:

src/main/resources/application-prod.yml

@@ -25,11 +25,11 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.90.214:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.90.214:8079}
+    url: ${AMSFEIGN_URL:localhost:8079}
   BmsFeign:
     url: ${BMSFEIGN_URL:172.16.90.214:8078}
   TmsFeign:
-    url: ${TMSFEIGN_URL:172.16.90.214:8086}
+    url: ${TMSFEIGN_URL:localhost:8086}
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.90.214:8093}
   OMSFeign:
@@ -54,7 +54,7 @@ feign:
     config:
       default:  #默认配置,连接时间要短，读取时间要长
         connectTimeout: 1000 #单位毫秒
-        readTimeout: 10000 #单位毫秒
+        readTimeout: 15000 #单位毫秒
 #熔断器
 hystrix:
   command:

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1
 spring:
   profiles:
-    include: ${SPRING_PROFILES:prod}
+    include: ${SPRING_PROFILES:dev}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8