Merge branch 'developer' into develop_ccs

amos-boot-module/amos-boot-module-api/amos-boot-module-command-api/src/main/java/com/yeejoin/amos/boot/module/command/api/dao/SeismometeorologyDtoDao.java

@@ -14,6 +14,7 @@ import org.springframework.stereotype.Component;
 import com.yeejoin.amos.boot.module.command.api.dto.SeismometeorologyDto;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.stereotype.Service;
+
 /**
  * @description:
  * @author: tw
@@ -28,65 +29,61 @@ public class SeismometeorologyDtoDao {
 
     /**
      * 保存对象SeismometeorologyDto
-     * @param
      *
+     * @param
      */
     public void saveObj(SeismometeorologyDto book) {
         mongoTemplate.save(book);
     }
 
 
-
     /**
-     *
      * 24小時预警
-     *
-     * **/
-    public   List<SeismometeorologyDto> findCarStateByWatchSn(){
-    	 System.out.println(new Date().getTime());
-         Query query = new Query(Criteria.where("releaseTime").gte(getStartTime())
-         		.lte(getEndTime()));
-         Sort sort= Sort.by(Sort.Direction.DESC, "releaseTime");
-         query.with(sort);
-         List<SeismometeorologyDto> gpsList = mongoTemplate.find(query, SeismometeorologyDto.class);
-         return gpsList;
+     **/
+    public List<SeismometeorologyDto> findCarStateByWatchSn() {
+        System.out.println(new Date().getTime());
+        Query query = new Query(Criteria.where("releaseTime").gte(getStartTime())
+                .lte(getEndTime()));
+        Sort sort = Sort.by(Sort.Direction.DESC, "releaseTime");
+        query.with(sort);
+        List<SeismometeorologyDto> gpsList = mongoTemplate.find(query, SeismometeorologyDto.class);
+        return gpsList;
     }
 
+
     /**
-     *
-     *当天气象预警
-     *
-     * **/
-    public   List<SeismometeorologyDto> findDutyCarStateBy(){
-       
+     * 当天气象预警
+     **/
+    public List<SeismometeorologyDto> findDutyCarStateBy() {
+
         System.out.println(new Date().getTime());
         Query query = new Query(Criteria.where("releaseTime").gte(getStartTime())
-        		.lte(getEndTime()));
-        Sort sort= Sort.by(Sort.Direction.DESC, "releaseTime");
+                .lte(getEndTime()));
+        Sort sort = Sort.by(Sort.Direction.DESC, "releaseTime");
         query.with(sort);
         List<SeismometeorologyDto> gpsList = mongoTemplate.find(query, SeismometeorologyDto.class);
         return gpsList;
     }
-    
-    
+
+
     private static Date getStartTime() {
-    	Calendar todayStart = Calendar.getInstance();
-    	todayStart.set(Calendar.HOUR_OF_DAY,0);
-    	todayStart.set(Calendar.MINUTE,0);
-    	todayStart.set(Calendar.SECOND,0);
-    	todayStart.set(Calendar.MILLISECOND,0);
-    	return todayStart.getTime();
+        Calendar todayStart = Calendar.getInstance();
+        todayStart.set(Calendar.HOUR_OF_DAY, 0);
+        todayStart.set(Calendar.MINUTE, 0);
+        todayStart.set(Calendar.SECOND, 0);
+        todayStart.set(Calendar.MILLISECOND, 0);
+        return todayStart.getTime();
     }
-     
+
     private static Date getEndTime() {
-    	Calendar todayEnd = Calendar.getInstance();
-    	todayEnd.set(Calendar.HOUR_OF_DAY,23);
-    	todayEnd.set(Calendar.MINUTE,59);
-    	todayEnd.set(Calendar.SECOND,59);
-    	todayEnd.set(Calendar.MILLISECOND,999);
-    	return todayEnd.getTime();
+        Calendar todayEnd = Calendar.getInstance();
+        todayEnd.set(Calendar.HOUR_OF_DAY, 23);
+        todayEnd.set(Calendar.MINUTE, 59);
+        todayEnd.set(Calendar.SECOND, 59);
+        todayEnd.set(Calendar.MILLISECOND, 999);
+        return todayEnd.getTime();
     }
 
- 
+
 }
 

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

@@ -60,13 +60,13 @@
                 and submission_time between #{startTime} and #{endTime}
             </if>
             <if test="submissionName != null ">
-                and submission_name = like concat (%, #{submissionName},%)
+                and submission_name like concat ('%', #{submissionName},'%')
             </if>
             <if test="submissionBranchId!= null ">
                 and submission_branch_id= #{submissionBranchId}
             </if>
             <if test="sequenceNbr!= null ">
-                and  sequence_nbr =  like concat (%,#{ sequenceNbr},%)
+                and  sequence_nbr   like concat ('%',#{ sequenceNbr},'%')
             </if>
         </where>
         order by submission_time DESC limit #{current},#{size}

amos-boot-module/amos-boot-module-api/amos-boot-module-latentdanger-api/src/main/java/com/yeejoin/amos/latentdanger/dao/entity/LatentDanger.java

@@ -90,7 +90,7 @@ public class LatentDanger extends BasicEntity {
     /**
      * 限制时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date reformLimitDate;
 
     private Integer overtimeState;

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/pom.xml

@@ -21,7 +21,7 @@
 		<dependency>
 			<groupId>cn.afterturn</groupId>
 			<artifactId>easypoi-base</artifactId>
-			<version>3.0.3</version>
+			<version>4.0.0</version>
 			<exclusions>
 				<exclusion>
 					<artifactId>poi-ooxml</artifactId>
@@ -32,12 +32,12 @@
 		<dependency>
 			<groupId>cn.afterturn</groupId>
 			<artifactId>easypoi-web</artifactId>
-			<version>3.0.3</version>
+			<version>4.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>cn.afterturn</groupId>
 			<artifactId>easypoi-annotation</artifactId>
-			<version>3.0.3</version>
+			<version>4.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.jsoup</groupId>

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java

@@ -39,7 +39,9 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.client.RestTemplate;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.foundation.exception.BaseException;
@@ -146,6 +148,8 @@ public class CommandController extends BaseController {
     @Autowired
     IUserCarService userCarService;
 
+    @Autowired
+    RestTemplate restTemplate;
 
     /**
      * 警情列表
@@ -1531,4 +1535,13 @@ public class CommandController extends BaseController {
     }
 
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "getAMapWeather", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "获取百度地图天气", notes = "获取百度地图天气")
+    public ResponseModel<Object> getAMapWeather() {
+        ResponseEntity<HashMap> weather = restTemplate.getForEntity(
+                "https://restapi.amap.com/v3/weather/weatherInfo?key=4bee67717254d93067fdbc09cd61c7d9&city=610100&extensions=all",
+                HashMap.class);
+        return ResponseHelper.buildResponse(weather);
+    }
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertCalledServiceImpl.java

@@ -1071,7 +1071,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 			String condition2 = "";
 			for (FormValue i : list) {
 				if (i.getKey().equals(AlertStageEnums.aircraftRescueSub.getCode())) {
-					condition2 = condition1 + i.getValue();
+					condition2 = i.getValue();
 				}
 			}
 			result= getIdsList1(alertCalled.getAlertTypeCode(),AlertStageEnums.救援预案警情类型.getValue() + "," + condition1,

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertSubmittedServiceImpl.java

@@ -445,10 +445,10 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
             }
 
             AlertSubmitted alertSubmittedNew = null;
-            Optional<AlertBusinessTypeEnum> alertBusinessTypeEnum =
-                    EnumsUtils.getEnumObject(AlertBusinessTypeEnum.class,
-                            e -> e.getCode().equals(calledRo.getAlertTypeCode()));
-            smsCode = alertBusinessTypeEnum.get().getSms_code();
+//            Optional<AlertBusinessTypeEnum> alertBusinessTypeEnum =
+//                    EnumsUtils.getEnumObject(AlertBusinessTypeEnum.class,
+//                            e -> e.getCode().equals(calledRo.getAlertTypeCode()));
+//            smsCode = alertBusinessTypeEnum.get().getSms_code();
 
 
             if (!alertWay.equals(AlertBusinessTypeEnum.警情初报.getCode())) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/service/impl/LatentDangerServiceImpl.java

@@ -1919,6 +1919,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
                 pageParam.put("reformLeaderId", jcsUserId);
                 // 登录人单位
                 pageParam.put("bizOrgCode", person.get("bizOrgCode").toString().substring(0, 6));
+                // 登录人为治理人
+                pageParam.put("governUserId", jcsUserId);
             }
         }
 

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

@@ -575,7 +575,10 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
         Date endDate = new Date();
         logger.info("-------------------------工作流列表时间" + (endDate.getTime() - startDate.getTime()));
         JSONArray taskJsonList = respBody.getJSONArray("data");
-        List<JSONObject> taskList = JSONObject.parseArray(taskJsonList.toJSONString(), JSONObject.class);
+        List<JSONObject> taskList = Lists.newArrayList();
+        if (!ValidationUtil.isEmpty(taskJsonList)) {
+            taskList = JSONObject.parseArray(taskJsonList.toJSONString(), JSONObject.class);
+        }
         List<String> bussinessKeys = new ArrayList<>();
         for (JSONObject json : taskList) {
             bussinessKeys.add(json.getString("businessKey"));
@@ -610,7 +613,12 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
             List<AgencyUserModel> users = remoteSecurityService.listUserByUserIds(toke, product, appKey, userIdsStr);
             Map<String, AgencyUserModel> userMap = Maps.uniqueIndex(users, AgencyUserModel::getUserId);
             for (LatentDangerBo bo : dangerList) {
-                JSONObject task = taskList.stream().filter(t -> t.getString("businessKey").equals(bo.getBusinessKey())).collect(Collectors.toList()).get(0);
+                List<JSONObject> filterTaskList =
+                        taskList.stream().filter(t -> t.getString("businessKey").equals(bo.getBusinessKey())).collect(Collectors.toList());
+                if (ValidationUtil.isEmpty(filterTaskList)) {
+                    continue;
+                }
+                JSONObject task = filterTaskList.get(0);
                 LatentDangerListVo vo = new LatentDangerListVo();
                 vo.setTaskId(task.getString("id"));
                 vo.setDangerId(bo.getId());

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/controller/CheckController.java

@@ -4,10 +4,7 @@ import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.supervision.business.constants.XJConstant;
 import com.yeejoin.amos.supervision.business.dto.CheckDto;
 import com.yeejoin.amos.supervision.business.dto.CheckInputItemDto;
-import com.yeejoin.amos.supervision.business.param.CheckInfoPageParam;
-import com.yeejoin.amos.supervision.business.param.CheckPageParam;
-import com.yeejoin.amos.supervision.business.param.CheckRecordParam;
-import com.yeejoin.amos.supervision.business.param.CheckStatisticalParam;
+import com.yeejoin.amos.supervision.business.param.*;
 import com.yeejoin.amos.supervision.business.service.intfc.ICheckService;
 import com.yeejoin.amos.supervision.business.service.intfc.IPlanTaskService;
 import com.yeejoin.amos.supervision.business.service.intfc.ISafety3DDataSendService;
@@ -50,6 +47,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Consumer;
 
 @RestController
 @RequestMapping(value = "/api/check")
@@ -546,8 +544,15 @@ public class CheckController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "保存检查记录", notes = "保存检查记录")
     @RequestMapping(value = "/saveRecord", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
-    public ResponseModel saveSupervisionCheckRecord(@ApiParam(value = "检查信息", required = false) @RequestBody(required = true) CheckRecordParam requestParam) {
+    public ResponseModel saveSupervisionCheckRecord(
+            @ApiParam(value = "检查信息", required = false)
+            @RequestBody CheckRecordParam requestParam) {
         try {
+            //存放检查人信息
+            requestParam.getCheckItems().forEach(checkInputParam -> {
+                checkInputParam.setUserId(getUserId());
+                checkInputParam.setUserName(getUserInfo().getRealName());
+            });
             ReginParams reginParams = getSelectedOrgInfo();
             String orgCode = getOrgCode(reginParams);
             requestParam.setOrgCode(orgCode);

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/param/CheckInputParam.java

@@ -12,21 +12,23 @@ import java.util.List;
  */
 @Data
 public class CheckInputParam {
-	private Long id;
-	private long inputItemId;
-	private String inputValue;
-	private String selectName;
-	private boolean isCheck;
-	private String remark;
-	private Long routePointItemId;
-	private String userId;
-	private String userName;
-	private String depId;
-	private String depName;
-	private List<CheckShot> checkInputShot = new ArrayList<>();
+    private Long id;
+    private long inputItemId;
+    private String inputValue;
+    private String selectName;
+    private boolean isCheck;
+    private String remark;
+    private Long routePointItemId;
+    private String userId;//检查人ID
+    private String userName;//检查人姓名
+    private String accompanyUserId;//陪同检查人姓名
+    private String accompanyUserName;//陪同检查人姓名
+    private String depId;
+    private String depName;
+    private List<CheckShot> checkInputShot = new ArrayList<>();
 
-	/**
-	 * 隐患列表
-	 */
-	private List<DangerDto> dangerList = new ArrayList<>();
+    /**
+     * 隐患列表
+     */
+    private List<DangerDto> dangerList = new ArrayList<>();
 }

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

@@ -1455,6 +1455,8 @@ public class CheckServiceImpl implements ICheckService {
                 checkInput.setRemark(item.getRemark());
                 checkInput.setUserId(item.getUserId());
                 checkInput.setUserName(item.getUserName());
+                checkInput.setAccompanyUserId(item.getAccompanyUserId());
+                checkInput.setAccompanyUserName(item.getAccompanyUserName());
                 checkInput.setDepId(item.getDepId());
                 checkInput.setDepName(item.getDepName());
                 //1.校验结果

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/HiddenDangerServiceImpl.java

@@ -315,6 +315,10 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
         List<CheckShot> shotList = iCheckShotDao.findAllByCheckIdAndCheckInputId(checkInput.getCheckId(), checkInput.getId());
         result.put("checkUserId", checkInput.getUserId());
         result.put("checkUserName", checkInput.getUserName());
+        result.put("accompanyUserId", checkInput.getAccompanyUserId());
+        result.put("accompanyUserName", checkInput.getAccompanyUserName());
+        result.put("accompanyingUserId", checkInput.getAccompanyUserId());
+        result.put("accompanyingUserName",checkInput.getAccompanyUserName());
         result.put("planExecuteTime", checkInput.getCreateDate());
         result.put("checkPhotoUrl", shotList.stream().map(CheckShot::getPhotoData).collect(Collectors.joining(",")));
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/util/FileHelper.java

@@ -5,7 +5,6 @@ import cn.afterturn.easypoi.excel.ExcelImportUtil;
 import cn.afterturn.easypoi.excel.entity.ExportParams;
 import cn.afterturn.easypoi.excel.entity.ImportParams;
 import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
-import com.alibaba.excel.metadata.Sheet;
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.MultiFormatWriter;
 import com.google.zxing.client.j2se.MatrixToImageWriter;
@@ -13,7 +12,6 @@ import com.google.zxing.common.BitMatrix;
 import com.yeejoin.amos.supervision.business.vo.PointVo;
 import com.yeejoin.amos.supervision.exception.YeeException;
 import org.apache.commons.io.FileUtils;
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
 import org.apache.poi.hssf.usermodel.*;
 import org.apache.poi.hwpf.HWPFDocument;
 import org.apache.poi.ss.usermodel.*;

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/vo/CheckVo.java

@@ -44,7 +44,10 @@ public class CheckVo {
      * 检查人
      */
     private String userName;
-
+    /**
+     * 陪同检查人
+     */
+    private String accompanyUserName;
     /**
      * 责任单位ID
      */

amos-boot-system-latentdanger/src/main/resources/db/mapper/LatentDangerMapper.xml

@@ -1017,12 +1017,6 @@
                 <if test="key == 'endDeadline' and value != null and value != ''">
                     and a.reform_limit_date <![CDATA[ <= ]]> #{value}
                 </if>
-                <if test="key == 'leadPeopleId' and value != null and value != ''">
-                    and ( 1=1 or a.biz_info->'$.leadPeopleId' = #{value})
-                </if>
-                <if test="key == 'reformLeaderId' and value != null and value != ''">
-                    and ( 1=1 or a.reform_json->'$.reformLeaderId' = #{value})
-                </if>
             </foreach>
         </where>
         <if test="paramMap.order != null and paramMap.order == 1">

amos-boot-system-patrol/src/main/resources/db/mapper/LatentDangerMapper.xml

@@ -871,11 +871,13 @@
          *
         FROM
             p_latent_danger pld
-        WHERE
-            pld.business_key IN
-        <foreach collection = "businessKeys" item = "businessKey" index="index" open = "(" close = ")" separator = "," >
-            #{businessKey}
-        </foreach>
+        WHERE 1=1
+        <if test="businessKeys != null and businessKeys.size > 0">
+            and pld.business_key IN
+            <foreach collection = "businessKeys" item = "businessKey" index="index" open = "(" close = ")" separator = "," >
+                #{businessKey}
+            </foreach>
+        </if>
         <if test="latentDangerListParam.dangerLevel != null and latentDangerListParam.dangerLevel != -1">
             and pld.danger_level=#{latentDangerListParam.dangerLevel}
         </if>
@@ -902,11 +904,13 @@
         count(*)
         FROM
         p_latent_danger pld
-        WHERE
-        pld.business_key IN
-        <foreach collection = "businessKeys" item = "businessKey" index="index" open = "(" close = ")" separator = "," >
-            #{businessKey}
-        </foreach>
+        WHERE 1=1
+        <if test="businessKeys != null and businessKeys.size > 0">
+            and pld.business_key IN
+            <foreach collection = "businessKeys" item = "businessKey" index="index" open = "(" close = ")" separator = "," >
+                #{businessKey}
+            </foreach>
+        </if>
         <if test="latentDangerListParam.dangerLevel != null and latentDangerListParam.dangerLevel != -1">
             and pld.danger_level=#{latentDangerListParam.dangerLevel}
         </if>

amos-boot-system-supervision/pom.xml

@@ -16,10 +16,6 @@
 			<version>${amos-biz-boot.version}</version>
 			<exclusions>
 				<exclusion>
-					<artifactId>easypoi-base</artifactId>
-					<groupId>cn.afterturn</groupId>
-				</exclusion>
-				<exclusion>
 					<artifactId>poi-ooxml</artifactId>
 					<groupId>org.apache.poi</groupId>
 				</exclusion>

amos-boot-system-supervision/src/main/resources/db/mapper/dbTemplate_check.xml

@@ -2012,6 +2012,7 @@
             ci.major_danger_num,
             ci.create_date checkTime,
             ci.user_name,
+            ci.accompany_user_name,
             pp.original_id,
             pp.name companyName,
 

amos-boot-system-supervision/src/main/resources/db/mapper/pointMapper.xml

@@ -1152,6 +1152,8 @@
 			pii.picture_json picJson,
 			pci.user_id userId,
 			pci.user_name userName,
+			pci.accompany_user_id accompanyUserId,
+			pci.accompany_user_name accompanyUserName,
 			pii.id itemId,
 			group_concat(pcs.photo_data) photoData,
 			COALESCE (pci.input_value, '') selectValue,