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.0</version>
+    <version>1.2</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>

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

@@ -357,9 +357,9 @@ public class RMScontroller extends BaseRESTfulController {
 
     @ApiOperation(value = "根据id更新详细人员信息", notes = "根据rmsPersonnel对象创建")
     @ApiImplicitParam(name = "rmsPersonnel", value = "详细实体rmsPersonnel", required = true, dataType = "rmsPersonnel")
-    @PostMapping(value = "/getPersonnelById/{personnelId}")
-    public Map<String, Object> getPersonnelById(@PathVariable("personnelId") BigDecimal personnelId) {
-        return rmsFeign.getPersonnelById(personnelId);
+    @PostMapping(value = "/getPersonnelById")
+    public Map<String, Object> getPersonnelById(@RequestBody(required = false) Map<String, Object> map) {
+        return rmsFeign.getPersonnelById(map);
     }
 
     @ApiOperation(value = "根据id更新详细人员信息", notes = "根据rmsPersonnel对象创建")
@@ -378,7 +378,6 @@ public class RMScontroller extends BaseRESTfulController {
         Map<String, Object> map = new HashMap<>();
         //获取Excel中包含的对象数组
         List<Map<String, Object>> list = ExcelToolUtils.getExcelList(file, 0);
-        map.put("list", list);
         Set<String> set = new HashSet<>();
         for (Map<String, Object> item : list) {
             //校验行
@@ -393,16 +392,14 @@ public class RMScontroller extends BaseRESTfulController {
                 throw new Exception("单元格数据异常（姓名/岗位/联系电话/身份证号码/所属单位/授权角色），请检查模板或数据是否正确!");
             }
             //隔开用于查询是否数据库存在
-            set.add(item.get("联系电话").toString());
-            //key-value结构方便数据库去重后获取值
-            map.put(item.get("联系电话").toString(),item);
+            set.add(item.get("联系电话").toString() +"-"+item.get("所属单位").toString());
         }
         //去重
-        String[] phones = set.toArray(new String[0]);
-        if (phones.length != list.size()) {
-            throw new Exception("手机号不允许重复！");
+        String[] array = set.toArray(new String[0]);
+        if (array.length != list.size()) {
+            throw new Exception("手机号-所属单位不允许重复！");
         }
-        map.put("list",phones);
+        map.put("list", list);
         map.put("userId",userId);
         map.put("userName",userName);
         return rmsFeign.importPersonnel(map);

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

@@ -170,8 +170,8 @@ public interface RmsFeign {
     @PostMapping(value = "api/v1/rms/rmspersonnel/updatePersonnel")
     Map<String, Object> updatePersonnel(@RequestBody(required = false) Map<String, Object> map);
 
-    @PostMapping(value = "api/v1/rms/rmspersonnel/getPersonnelById/{personnelId}")
-    Map<String, Object> getPersonnelById(@PathVariable("personnelId") BigDecimal personnelId);
+    @PostMapping(value = "api/v1/rms/rmspersonnel/getPersonnelById")
+    Map<String, Object> getPersonnelById(@RequestBody(required = false) Map<String, Object> map);
 
     @PostMapping(value = "api/v1/rms/rmspersonnel/syncPersonnel")
     Map<String, Object> syncPersonnel(@RequestBody(required = false) Map<String, Object> map);

src/main/java/com/steerinfo/dil/util/SSOUtil.java

@@ -102,7 +102,6 @@ public class SSOUtil {
                 throw new Exception("登录SSO失败！");
             }
             JSONObject result =  ssoFeign.getRolesUser(token,companyId);
-            log.debug(result);
             return result;
         }catch (Exception e){
             e.printStackTrace();

src/main/resources/application-prod.yml

@@ -25,11 +25,11 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.90.214:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:localhost:8079}
+    url: ${AMSFEIGN_URL:172.16.90.214:8079}
   BmsFeign:
     url: ${BMSFEIGN_URL:172.16.90.214:8078}
   TmsFeign:
-    url: ${TMSFEIGN_URL:localhost:8086}
+    url: ${TMSFEIGN_URL:172.16.90.214:8086}
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.90.214:8093}
   OMSFeign:

src/main/resources/bootstrap.yml

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

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -349,24 +349,30 @@
         FETCH NEXT 10 ROWS ONLY
     </select>
     <select id="getCapacityTypeByLike" resultType="java.util.Map">
-        select  DISTINCT * from(
+        select * from(
         select
         RCT.CAPACITY_TYPE_ID "capacityTypeId",
         RCT.CAPACITY_TYPE_NAME "capacityTypeName",
         RCT.CAPACITY_TYPE_ID "id",
         RCT.CAPACITY_TYPE_ID "value",
         RCT.CAPACITY_TYPE_NAME "label",
-        RCT.CAPACITY_TYPE_NAME "text"
+        RCT.CAPACITY_TYPE_NAME "text",
         RCT .CAPACITY_MAX_LOAD "capacityMaxLoad",
-        '[' || listagg (RCFT .FUEL_TYPE_ID, ',') WITHIN GROUP (ORDER BY RCT .CAPACITY_TYPE_ID) || ']'  "fuelTypeIds",
-        listagg (RFT .FUEL_TYPE_NAME, '/') WITHIN GROUP (ORDER BY RCT .CAPACITY_TYPE_ID)  "fuelTypes"
+        '[' || listagg (RCFT .FUEL_TYPE_ID, ',') WITHIN GROUP (ORDER BY RCT .CAPACITY_TYPE_ID) || ']' "fuelTypeIds",
+        listagg (RFT .FUEL_TYPE_NAME, '/') WITHIN GROUP (ORDER BY RCT .CAPACITY_TYPE_ID) "fuelTypes"
         from RMS_CAPACITY_TYPE RCT
         LEFT JOIN RMS_CAPACITY_FUEL_TYPE RCFT ON RCFT.CAPACITY_TYPE_ID = RCT .CAPACITY_TYPE_ID
         LEFT JOIN RMS_FUEL_TYPE RFT ON RFT .FUEL_TYPE_ID = RCFT.FUEL_TYPE_ID
-        where RCT.DELETED=0
+        <where>
+            RCT.DELETED=0
+            <if test="index!=null and index!=''">
+                AND REGEXP_LIKE(RCT.CAPACITY_TYPE_NAME, #{index})
+            </if>
+        </where>
         GROUP BY RCT .CAPACITY_TYPE_ID,RCT.CAPACITY_TYPE_NAME,RCT .CAPACITY_MAX_LOAD
-
-        <if test="id!=null and id.size>0 and !(index!=null and index!='')">
+        FETCH NEXT 10 ROWS ONLY
+        )
+        <if test="id!=null and id.size>0">
         UNION
             select
             RCT.CAPACITY_TYPE_ID "capacityTypeId",
@@ -374,28 +380,19 @@
             RCT.CAPACITY_TYPE_ID "id",
             RCT.CAPACITY_TYPE_ID "value",
             RCT.CAPACITY_TYPE_NAME "label",
-            RCT.CAPACITY_TYPE_NAME "text"
+            RCT.CAPACITY_TYPE_NAME "text",
             RCT .CAPACITY_MAX_LOAD "capacityMaxLoad",
             '[' || listagg (RCFT .FUEL_TYPE_ID, ',') WITHIN GROUP (ORDER BY RCT .CAPACITY_TYPE_ID) || ']'  "fuelTypeIds",
             listagg (RFT .FUEL_TYPE_NAME, '/') WITHIN GROUP (ORDER BY RCT .CAPACITY_TYPE_ID)  "fuelTypes"
             from RMS_CAPACITY_TYPE RCT
             LEFT JOIN RMS_CAPACITY_FUEL_TYPE RCFT ON RCFT.CAPACITY_TYPE_ID = RCT .CAPACITY_TYPE_ID
             LEFT JOIN RMS_FUEL_TYPE RFT ON RFT .FUEL_TYPE_ID = RCFT.FUEL_TYPE_ID
-            where RCT.DELETED=0
-            GROUP BY RCT .CAPACITY_TYPE_ID,RCT.CAPACITY_TYPE_NAME,RCT .CAPACITY_MAX_LOAD
-            WHERE "id" in
+            WHERE RCT.CAPACITY_TYPE_ID in
             <foreach collection="id" item="item"  open="(" close=")" separator="," >
                 #{item}
             </foreach>
+            GROUP BY RCT .CAPACITY_TYPE_ID,RCT.CAPACITY_TYPE_NAME,RCT .CAPACITY_MAX_LOAD
         </if>
-        )
-        <where>
-            <if test="index!=null and index!=''">
-                AND REGEXP_LIKE("label", #{index})
-            </if>
-        </where>
-        FETCH NEXT 10 ROWS ONLY
-
     </select>
     <select id="getLineByLike" resultType="java.util.Map">
         select * from(