任务 24281

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/interceptor/PluginInterceptor.java

@@ -84,6 +84,53 @@ public class PluginInterceptor implements Interceptor {
             ReflectionUtils.makeAccessible(field);
             field.set(boundSql, sql);
             return executor.query(mappedStatement, parameter, rowBounds, resultHandler, cacheKey, boundSql);
+        } else if ("com.yeejoin.amos.boot.module.common.api.mapper.DynamicFormInstanceMapper.listAll".equals(id) ||
+                "com.yeejoin.amos.boot.module.common.api.mapper.DynamicFormInstanceMapper.listOneDayDutyPerson".equals(id) ||
+                "com.yeejoin.amos.boot.module.common.api.mapper.DynamicFormInstanceMapper.pageList".equals(id)) {
+            HashMap par = new HashMap();
+            if (parameter instanceof HashMap) {
+                par = (HashMap) ((HashMap<?, ?>) parameter).get("params");
+            }
+
+            Iterator<String> iterator = par.keySet().iterator();
+
+            while (iterator.hasNext()) {
+                String next = iterator.next();
+                sql = sql.replaceFirst("_code", next);
+            }
+
+            //通过反射修改sql语句
+            Field field = boundSql.getClass().getDeclaredField("sql");
+            ReflectionUtils.makeAccessible(field);
+            field.set(boundSql, sql);
+            return executor.query(mappedStatement, parameter, rowBounds, resultHandler, cacheKey, boundSql);
+        } else if ("com.yeejoin.amos.boot.module.common.api.mapper.DynamicFormInstanceMapper.pageListNew".equals(id)) {
+            HashMap par = new HashMap();
+            HashMap par1 = new HashMap();
+            if (parameter instanceof HashMap) {
+                par = (HashMap) ((HashMap<?, ?>) parameter).get("params");
+                par1 = (HashMap) ((HashMap<?, ?>) parameter).get("fieldCodes");
+            }
+
+            Iterator<String> iterator = par.keySet().iterator();
+
+            while (iterator.hasNext()) {
+                String next = iterator.next();
+                sql = sql.replaceFirst("_code", next);
+            }
+
+            Iterator<String> iterator1 = par1.keySet().iterator();
+
+            while (iterator1.hasNext()) {
+                String next = iterator1.next();
+                sql = sql.replaceFirst("_keyName", next);
+            }
+
+            //通过反射修改sql语句
+            Field field = boundSql.getClass().getDeclaredField("sql");
+            ReflectionUtils.makeAccessible(field);
+            field.set(boundSql, sql);
+            return executor.query(mappedStatement, parameter, rowBounds, resultHandler, cacheKey, boundSql);
         } else {
             return invocation.proceed();
         }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/DynamicFormInstanceMapper.xml

@@ -107,16 +107,16 @@
             <foreach collection="params" index="key" item="value" separator="">
                 <choose>
                     <when test="fieldCodes[key] == 'like' and value !=null and value !=''">
-                        and d.${key} like concat('%',#{value},'%')
+                        and d._code like concat('%',#{value},'%')
                     </when>
                     <when test="fieldCodes[key] == 'eq' and value !=null and value !=''">
-                        and d.${key} = #{value}
+                        and d._code = #{value}
                     </when>
                     <when test="fieldCodes[key] == 'ge' and value !=null and value !=''">
-                        and d.${key} >= #{value}
+                        and d._code >= #{value}
                     </when>
                     <when test="fieldCodes[key] == 'le' and value !=null and value !=''">
-                        and d.${key} <![CDATA[<=]]> #{value}
+                        and d._code <![CDATA[<=]]> #{value}
                     </when>
                 </choose>
             </foreach>
@@ -157,10 +157,10 @@
             <foreach collection="params" index="key" item="value" separator="">
                 <choose>
                     <when test="fieldCodes[key] == 'like' and value !=null and value !=''">
-                        and d.${key} like concat('%',#{value},'%')
+                        and d._code like concat('%',#{value},'%')
                     </when>
                     <when test="fieldCodes[key] == 'eq' and value !=null and value !=''">
-                        and d.${key} = #{value}
+                        and d._code = #{value}
                     </when>
                 </choose>
             </foreach>
@@ -211,10 +211,10 @@
             <foreach collection="params" index="key" item="value" separator="">
                 <choose>
                     <when test="fieldCodes[key] == 'like' and value !=null and value !=''">
-                        and d.${key} like concat('%',#{value},'%')
+                        and d._code like concat('%',#{value},'%')
                     </when>
                     <when test="fieldCodes[key] == 'eq' and value !=null and value !=''">
-                        and d.${key} = #{value}
+                        and d._code = #{value}
                     </when>
                 </choose>
             </foreach>
@@ -335,7 +335,7 @@
         <foreach collection="fieldCodes" item="value" index="key" >
             ,MAX(CASE WHEN i.FIELD_CODE = #{key} THEN i.FIELD_VALUE END) as #{key},
             IF(FIND_IN_SET(i.field_type,'radio,select,treeSelect'), MAX(CASE WHEN i.FIELD_CODE = #{key} THEN
-            i.FIELD_VALUE_LABEL END), null) as ${key}Label
+            i.FIELD_VALUE_LABEL END), null) as _keyNameLabel
         </foreach>
         from
         cb_dynamic_form_instance i
@@ -361,16 +361,16 @@
             <foreach collection="params" index="key" item="value" separator="">
                 <choose>
                     <when test="fieldCodes[key] == 'like' and value !=null and value !=''">
-                        and d.${key} like concat('%',#{value},'%')
+                        and d._code like concat('%',#{value},'%')
                     </when>
                     <when test="fieldCodes[key] == 'eq' and value !=null and value !=''">
-                        and d.${key} = #{value}
+                        and d._code = #{value}
                     </when>
                     <when test="fieldCodes[key] == 'ge' and value !=null and value !=''">
-                        and d.${key} >= #{value}
+                        and d._code >= #{value}
                     </when>
                     <when test="fieldCodes[key] == 'le' and value !=null and value !=''">
-                        and d.${key} <![CDATA[<=]]> #{value}
+                        and d._code <![CDATA[<=]]> #{value}
                     </when>
                 </choose>
             </foreach>

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java

@@ -2013,7 +2013,6 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
         map.put("bizOrgCode", mapPatrol.get("bizOrgCode").toString());
         map.put("bizOrgName", mapPatrol.get("bizOrgName").toString());
         try {
-            log.info("每日统计当天巡检任务情况:{}===========", map);
             emqKeeper.getMqttClient().publish("equip/patrol/put", JSONObject.toJSONString(map).getBytes(), 1, false);
         } catch (MqttException exp) {
             log.info(String.format("发送eqm转kafka消息失败：%s", exp.getMessage()));

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/CheckServiceImpl.java

@@ -123,8 +123,6 @@ public class CheckServiceImpl implements ICheckService {
     @Value("${auth-key-auth-enabled:}")
     private String authKeyEnabled;
 
-    public static final Logger log = LoggerFactory.getLogger(CheckServiceImpl.class);
-
     @Override
     public Page<CheckInfoVo> getCheckInfo(String toke,String product,String appKey,CheckInfoPageParam param) {
     	 long total = checkMapper.getCheckInfoCount(param);
@@ -630,7 +628,6 @@ public class CheckServiceImpl implements ICheckService {
             }
             // check = checkDao.save(check);
             try {
-                log.error("手机app保存巡检记录++++++++++++++++++++++" + check.toString() + "<Over><Over><Over><Over>");
                 check = checkDao.save(check);
             } catch (Exception e) {
                 e.printStackTrace();

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/common/remote/RemoteWorkFlowService.java

@@ -20,7 +20,6 @@ import java.util.Map;
 @Service("remoteWorkFlowService")
 public class RemoteWorkFlowService {
 
-    private final Logger logger = LoggerFactory.getLogger(RemoteWorkFlowService.class);
 
     @Value("${params.work.flow.address}")
     private String address;
@@ -73,7 +72,6 @@ public class RemoteWorkFlowService {
         headerMap.put(XJConstant.PRODUCT, RequestContext.getProduct());
         headerMap.put(XJConstant.APPKEY, RequestContext.getAppKey());
         String resultStr = HttpUtil.sendHttpGetWithHeader(url, headerMap);
-        logger.info("\r\n请求路径=======================>" + url + "\r\n请求参数=======================>" + instanceId + "\r\n返回参数=======================>" + resultStr);
         return  handleResult(resultStr);
     }
 
@@ -104,7 +102,6 @@ public class RemoteWorkFlowService {
 //        String requestBody = body.toJSONString();
         body.put("variables", dangerIdJson);
         String resultStr = HttpUtil.sendHttpPostJsonWithHeader(url, body.toJSONString(), headerMap);
-        logger.info("\r\n请求路径=======================>" + url + "\r\n请求参数=======================>" + body + "\r\n返回参数=======================>" + resultStr);
         return JSON.parseObject(resultStr);
     }
 
@@ -116,7 +113,6 @@ public class RemoteWorkFlowService {
         String url = buildUrl(address, WorkFlowUriEnum.启动免登录流程, map);
         String requestBody = body.toJSONString();
         String resultStr = HttpUtil.sendHttpPostJson(url, requestBody);
-        logger.info("\r\n请求路径=======================>" + url + "\r\n请求参数=======================>" + requestBody + "\r\n返回参数=======================>" + resultStr);
         return handleResult(resultStr);
     }
 
@@ -133,7 +129,6 @@ public class RemoteWorkFlowService {
         dangerIdJson.put("dangerId", dangerId);
         body.put("variables", dangerIdJson);
         String resultStr = HttpUtil.sendHttpPostJsonWithHeader(url, body.toJSONString(), headerMap);
-        logger.info("\r\n请求路径=======================>" + url + "\r\n请求参数=======================>" + body + "\r\n返回参数=======================>" + resultStr);
         return JSON.parseObject(resultStr);
     }
 //    public JSONObject stop(String processInstanceId, String deleteReason) {
@@ -143,7 +138,6 @@ public class RemoteWorkFlowService {
 //        String url = buildUrl(address, WorkFlowUriEnum.终止流程, map);
 //        String resultStr = HttpUtil.sendHttpDelete(url);
 //        JSONObject json = handleResult(resultStr);
-//        logger.info("\r\n终止流程请求路径=======================>" + url + "\r\n终止流程返回参数=======================>" + resultStr);
 //        return json;
 //    }
 
@@ -158,7 +152,6 @@ public class RemoteWorkFlowService {
         String url = buildUrl(address, WorkFlowUriEnum.终止流程, map);
         String resultStr = HttpUtil.sendHttpDeleteWithHeader(url, headerMap);
         JSONObject json = handleResult(resultStr);
-        logger.info("\r\n请求路径=======================>" + url + "\r\n返回参数=======================>" + resultStr);
         return json;
     }
 
@@ -168,7 +161,6 @@ public class RemoteWorkFlowService {
 //        String url = buildUrl(address, WorkFlowUriEnum.执行流程, map);
 //        String resultStr = HttpUtil.sendHttpPostJson(url, requestBody);
 //        JSONObject json = handleResult(resultStr);
-//        logger.info("\r\n执行任务请求路径=======================>" + url + "\r\n执行任务请求参数=======================>" + requestBody + "\r\n执行任务返回参数=======================>" + resultStr);
 //        return json;
 //    }
 
@@ -182,7 +174,6 @@ public class RemoteWorkFlowService {
         String url = buildUrl(address, WorkFlowUriEnum.执行流程, map);
         String resultStr = HttpUtil.sendHttpPostJsonWithHeader(url, requestBody, headerMap);
         JSONObject json = handleResult(resultStr);
-        logger.info("\r\n请求路径=======================>" + url + "\r\n请求参数=======================>" + requestBody + "\r\n返回参数=======================>" + resultStr);
         return json;
     }
 
@@ -192,7 +183,6 @@ public class RemoteWorkFlowService {
         String url = buildUrl(address, WorkFlowUriEnum.当前节点, map);
         String resultStr = HttpUtil.sendHttpGet(url);
         JSONObject json = handleResult(resultStr);
-        logger.info("\r\n当前任务请求路径=======================>" + url + "\r\n当前任务返回参数=======================>" + resultStr);
         if (json == null) {
             return null;
         }
@@ -213,7 +203,6 @@ public class RemoteWorkFlowService {
         headerMap.put(XJConstant.APPKEY, RequestContext.getAppKey());
         String resultStr = HttpUtil.sendHttpGetWithHeader(url, headerMap);
         JSONObject json = handleResult(resultStr);
-        logger.info("\r\n请求路径=======================>" + url + "\r\n返回参数=======================>" + resultStr);
         if (json == null) {
             return null;
         }
@@ -240,7 +229,6 @@ public class RemoteWorkFlowService {
         headerMap.put(XJConstant.APPKEY, RequestContext.getAppKey());
         String resultStr = HttpUtil.sendHttpGetWithHeader(url, headerMap);
         JSONObject json = handleResult(resultStr);
-        logger.info("\r\n请求路径=======================>" + url + "\r\n返回参数=======================>" + resultStr);
         return json;
     }
 
@@ -261,7 +249,6 @@ public class RemoteWorkFlowService {
         headerMap.put(XJConstant.APPKEY, RequestContext.getAppKey());
         String resultStr = HttpUtil.sendHttpGetWithHeader(url, headerMap);
         JSONObject json = handleResult(resultStr);
-        logger.info("\r\n请求路径=======================>" + url + "\r\n返回参数=======================>" + resultStr);
         return json;
     }
 
@@ -275,7 +262,6 @@ public class RemoteWorkFlowService {
         headerMap.put(XJConstant.APPKEY, RequestContext.getAppKey());
         String resultStr = HttpUtil.sendHttpGetWithHeader(url, headerMap);
         JSONObject json = handleResult(resultStr);
-        logger.info("\r\n请求路径=======================>" + url + "\r\n返回参数=======================>" + resultStr);
         return json;
     }
     public JSONObject queryTaskNoAuth(String id) {
@@ -288,7 +274,6 @@ public class RemoteWorkFlowService {
         headerMap.put(XJConstant.APPKEY, RequestContext.getAppKey());
         String resultStr = HttpUtil.sendHttpGetWithHeader(url, headerMap);
         JSONObject json = handleResult(resultStr);
-        logger.info("\r\n请求路径=======================>" + url + "\r\n返回参数=======================>" + resultStr);
         return json;
     }
     public JSONObject queryTaskDetail(String taskId) {
@@ -301,7 +286,6 @@ public class RemoteWorkFlowService {
         headerMap.put(XJConstant.APPKEY, RequestContext.getAppKey());
         String resultStr = HttpUtil.sendHttpGetWithHeader(url, headerMap);
         JSONObject json = handleResult(resultStr);
-        logger.info("\r\n请求路径=======================>" + url + "\r\n返回参数=======================>" + resultStr);
         return json;
     }
     public JSONObject queryFinishTaskDetail(String taskId) {
@@ -314,7 +298,6 @@ public class RemoteWorkFlowService {
         headerMap.put(XJConstant.APPKEY, RequestContext.getAppKey());
         String resultStr = HttpUtil.sendHttpGetWithHeader(url, headerMap);
         JSONObject json = handleResult(resultStr);
-        logger.info("\r\n请求路径=======================>" + url + "\r\n返回参数=======================>" + resultStr);
         return json;
     }
 }