Merge branch 'develop_dl_bugfix_0723' of…

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/resources/mapper/FireEquipmentSignalLogMapper.xml

@@ -61,7 +61,7 @@
         </if>
         order by a.create_date desc
         <if test="top != null">
-         limit ${top}
+         limit @TOP
         </if>
     </select>
     <select id="distinctByEquipmentId" resultType="com.yeejoin.amos.boot.module.ccs.api.dto.FireEquipmentDto">

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/resources/mapper/FireRiskSourceMapper.xml

@@ -17,7 +17,7 @@
         ORDER BY
         rs.rpni DESC, rs.rpn DESC
         <if test="top != null and top !=''">
-            limit ${top}
+            limit @TOP
         </if>
     </select>
 </mapper>

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

@@ -37,8 +37,6 @@ public class PluginInterceptor implements Interceptor {
      * @throws Throwable
      */
     public Object intercept(Invocation invocation) throws Throwable {
-        System.out.println("====intercept======");
-
         Object[] args = invocation.getArgs();
         MappedStatement mappedStatement = (MappedStatement) args[0];
         Object parameter = args[1];
@@ -134,18 +132,45 @@ public class PluginInterceptor implements Interceptor {
             ReflectionUtils.makeAccessible(field);
             field.set(boundSql, sql);
             return executor.query(mappedStatement, parameter, rowBounds, resultHandler, cacheKey, boundSql);
-        } else {
+        } else if (
+                "com.yeejoin.amos.boot.module.ccs.api.mapper.FireEquipmentSignalLogMapper.queryAlarmLogList".equals(id) ||
+                "com.yeejoin.amos.boot.module.ccs.api.mapper.FireRiskSourceMapper.queryForRpnDescList".equals(id)
+        ) {
+            String orderBy = "";
+            if (parameter instanceof HashMap) {
+                orderBy = ((HashMap<?, ?>) parameter).get("top").toString();
+            }
+            sql = sql.replaceAll("@TOP", orderBy);
+
+            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.indicators.report.api.mapper.IdxBizEventQuestionLogMapper.IdxBizEventQuestionLogModel".equals(id)
+        ) {
+            String orderBy = "";
+            if (parameter instanceof HashMap) {
+                orderBy = ((HashMap<?, ?>) parameter).get("orderBy").toString();
+            }
+            sql = sql.replaceAll("@ORDER_BY", orderBy);
+
+            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();
         }
     }
 
     public Object plugin(Object target) {
-        System.out.println("-----------------------------plugin-------------------------");
         return Plugin.wrap(target, this);
     }
 
     public void setProperties(Properties properties) {
-        System.out.println("====setProperties======");
     }
 
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/SignMapper.xml

@@ -226,10 +226,10 @@
             <if test="sortField != null and sortField != ''">
                 <choose>
                     <when test="sortOrder == 'ascend'">
-                        ${sortField} ASC
+                        @SORT_FIELD ASC
                     </when>
                     <otherwise>
-                        ${sortField} DESC
+                        @SORT_FIELD DESC
                     </otherwise>
                 </choose>
             </if>

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java

@@ -234,6 +234,33 @@ public class OrgUsrController extends BaseController {
 	}
 
 	/**
+	 * 获取单位图片
+	 *
+	 * @param id
+	 * @return
+	 */
+	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+	@RequestMapping(value = "/getUnit/{id}/companyPhoto", method = RequestMethod.GET)
+	@ApiOperation(httpMethod = "GET", value = "获取单位图片", notes = "获取单位图片")
+	public ResponseModel<Map<String, Object>> companyPhoto(HttpServletRequest request, @PathVariable Long id) throws Exception {
+		OrgUsrFormDto orgUsrFormDto = iOrgUsrService.selectCompanyById(id);
+		Map<String, Object> map = orgUsrFormDto.getMap();
+		Map<String, Object> resultMap = new HashMap<>();
+		resultMap.put("current", 1);
+		resultMap.put("total", 1);
+		resultMap.put("records", new ArrayList<>());
+		if (!ObjectUtils.isEmpty(map)) {
+			List<Map<String, Object>> list = new ArrayList<>();
+			HashMap<String, Object> hashMap = new HashMap<>();
+			hashMap.put("url", map.getOrDefault("companyPhoto", ""));
+			list.add(hashMap);
+			resultMap.put("records", list);
+			return ResponseHelper.buildResponse(resultMap);
+		}
+		return ResponseHelper.buildResponse(resultMap);
+	}
+
+	/**
 	 * 根据单位code查询单位
 	 *
 	 * @param code

amos-boot-utils/amos-boot-utils-adpter/src/main/resources/application-dev.properties

@@ -13,7 +13,7 @@ eureka.instance.metadata-map.management.api-docs=http://172.16.11.201:${server.p
 eureka.instance.hostname=172.16.11.201
 #eureka服务配置的校验账号及密码,配置需和eureka服务后台配置文件中一致
 spring.security.user.name=admin
-spring.security.user.password=a1234560
+spring.security.user.password=ENC(L4qq21tOLsPYx2assArZ2y0/dfYZFRtVZWzj31kDKo66XB/Kgw7759Psu+deB2N1)
 eureka.client.serviceUrl.defaultZone=http://${spring.security.user.name}:${spring.security.user.password}@${eureka.instance.hostname}:10001/eureka/
 ##########eureka配置信息###############
 
@@ -29,4 +29,4 @@ source.jdbc.ip.buss=jdbc:mysql://172.16.11.201:3306/dl_business?useUnicode=true&
 goal.jdbc.ip.buss=jdbc:mysql://172.16.11.201:3306/dl_business_copy?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
 
 yeejoin.user=root
-yeejoin.pwd=Yeejoin@2020
+yeejoin.pwd=ENC(9OWq6vJ9UzjgCfz8dAdzgMT5WkUTmyHkVdd3HoP80K9l5XOzu7dbmpgfXzvqANjJ)
\ No newline at end of file