Merge branch 'developer' into chenhao

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FailureDetailsMapper.java

@@ -22,7 +22,10 @@ public interface FailureDetailsMapper extends BaseMapper<FailureDetails> {
 
     /**
      * 查询全部 分页
-     *
+     * @param currentStatus 当前任务状态
+     *      * @param  startTime 起始时间
+     *      * @param endTime 结束时间
+     *      * @param submissionPid 报送人
      * @param current 当前页
      * @return
      */
@@ -30,11 +33,33 @@ public interface FailureDetailsMapper extends BaseMapper<FailureDetails> {
     List<FailureDetails> selectAllPage(Long current,Long size, Long currentStatus,
                                         String startTime,String endTime, Integer submissionPid);
 
+
+
+    /**
+     * WEB端查询全部 分页
+     *
+     * @param current 当前页
+     * @param currentStatus 当前任务状态
+     * @param  startTime 起始时间
+     * @param endTime 结束时间
+     * @param submissionPid 报送人
+     * @param submissionBranchId 报送部门
+     * @param sequenceNbr 故障单号
+     * @return
+     */
+
+    List<FailureDetails> selectWebAll(Long current,Long size, Long currentStatus,
+                                       String startTime,String endTime, String submissionName,Integer  submissionBranchId,
+                                      Long sequenceNbr);
+
     /**
      * 查询我发起的 分页
      * current 当前页
      * size 条数
-     *
+     * @param currentStatus 当前任务状态
+     *      * @param  startTime 起始时间
+     *      * @param endTime 结束时间
+     *      * @param submissionPid 报送人
      * @return
      */
     List<FailureDetails> selectISubPage(Long current,Long size, Long currentStatus,
@@ -42,7 +67,10 @@ public interface FailureDetailsMapper extends BaseMapper<FailureDetails> {
 
     /**
      * 查询待处理 分页
-     *
+     * @param currentStatus 当前任务状态
+     *      * @param  startTime 起始时间
+     *      * @param endTime 结束时间
+     *      * @param submissionPid 报送人
      * @param
      * @return
      */
@@ -58,7 +86,10 @@ public interface FailureDetailsMapper extends BaseMapper<FailureDetails> {
                                              String startTime,String endTime, Integer submissionPid);
     /**
      * 查询待处理  维修人员分页
-     *
+     * @param currentStatus 当前任务状态
+     *      * @param  startTime 起始时间
+     *      * @param endTime 结束时间
+     *      * @param submissionPid 报送人
      * @param
      * @return
      */

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

@@ -29,9 +29,45 @@
             </if>
         </where>
         order by submission_time DESC limit #{current},#{size}
+    </select>
 
+    <select id="selectWebAll" resultType="com.yeejoin.amos.boot.module.common.api.entity.FailureDetails">
+        SELECT
+        sequence_nbr,
+        current_status,
+        failure_equipment_id,
+        failure_equipment,
+        fault_time,
+        fault_phenomenon,
+        submission_name,
+        submission_pid,
+        biz_code,
+        submission_time,
+        submission_branch,
+        submission_branch_id
+        FROM
+        cb_failure_details
+        <where>
+            <if test="currentStatus!= null ">
+                and current_status = #{currentStatus}
+            </if>
+            <if test="startTime!= null and endTime != null">
+                and submission_time between #{startTime} and #{endTime}
+            </if>
+            <if test="submissionName!= null ">
+                and submission_name = #{submissionName}
+            </if>
+            <if test="submissionBranchId!= null ">
+                and submission_branch_id= #{submissionBranchId}
+            </if>
+            <if test="sequenceNbr!= null ">
+                and sequence_nbr = #{sequenceNbr}
+            </if>
+        </where>
+        order by submission_time DESC limit #{current},#{size}
     </select>
 
+
     <select id="selectISubPage" resultType="com.yeejoin.amos.boot.module.common.api.entity.FailureDetails">
         SELECT sequence_nbr,
         current_status,

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

@@ -6,7 +6,6 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import io.swagger.annotations.ApiImplicitParam;
 import org.apache.commons.io.IOUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -242,4 +241,52 @@ public class FailureDetailsController extends BaseController {
         }
         
     }
+
+    /**
+     * Web端列表分页查询
+     *
+     * @param current 当前页
+     * @param size    每页大小
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/weblist")
+    @ApiOperation(httpMethod = "GET", value = "Web端列表分页查询", notes = "Web端列表分页查询")
+    public ResponseModel<IPage<FailureDetailsDto>> queryForPageList(@RequestParam(value = "current") Long current, @RequestParam
+            (value = "size") Long size, Long currentStatus,
+                                        String submissionName,
+                                        String startTime,
+                                        String endTime,
+                                        Integer  submissionBranchId,
+                                        Long sequenceNbr ) {
+        Page<FailureDetails> page = new Page<FailureDetails>();
+        if (current > 0) {
+            page.setCurrent((current - 1) * size);
+        } else {
+            page.setCurrent(current);
+        }
+
+        page.setSize(size);
+        ReginParams userInfo = getSelectedOrgInfo();
+        IPage<FailureDetailsDto> failureDetailDTOsIPage = new Page<>();
+
+        IPage<FailureDetails> failureDetailsIPage = failureDetailsServiceImpl.queryForPageList(page, userInfo,
+                currentStatus, startTime, endTime, submissionName,submissionBranchId,sequenceNbr);
+
+        BeanUtils.copyProperties(failureDetailsIPage, FailureDetailsDto.class);
+        List<FailureDetails> records = failureDetailsIPage.getRecords();
+        List<FailureDetailsDto> failureDetailsDtoList = new ArrayList<>();
+        records.forEach(failureDetails -> {
+            FailureDetailsDto failureDetailsDto = new FailureDetailsDto();
+            BeanUtils.copyProperties(failureDetails, failureDetailsDto);
+
+            failureDetailsDto.setCurrentStatusName(
+                    Constants.currentStatusNameMap.get(failureDetails.getCurrentStatus()));
+            failureDetailsDtoList.add(failureDetailsDto);
+        });
+        failureDetailDTOsIPage.setRecords(failureDetailsDtoList);
+
+        return ResponseHelper.buildResponse(failureDetailDTOsIPage);
+    }
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureDetailsServiceImpl.java

@@ -105,6 +105,17 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
     }
 
 
+    public IPage<FailureDetails> queryForPageList(Page<FailureDetails> page, ReginParams userInfo, Long currentStatus,
+                                                            String startTime, String endTime, String submissionName, Integer  submissionBranchId,
+                                                  Long sequenceNbr ) {
+
+
+        List<FailureDetails> list =baseMapper.selectWebAll(page.getCurrent(), page.getSize(), currentStatus, startTime, endTime, submissionName,submissionBranchId,sequenceNbr);
+        IPage<FailureDetails> iPage = new Page<>();
+        iPage.setRecords(list);
+        return iPage;
+    }
+
     /**
      * 待处理分页查询
      */
@@ -239,8 +250,11 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
         Long departmentId = failureDetailsDto.getBizCode();
         Date processTime = model.getSubmissionTime();
         String processAuditorName = failureDetailsDto.getSubmissionName();
+        System.out.println(System.currentTimeMillis());
         repairlog(faultId, processAuditorId, departmentId, processTime, processDepartment, processResult, processAuditorName);
+
         if (excuteTask(instance.getString("id"), userInfo, null)) {
+
             return true;
         } else {
             throw new Exception("执行流程失败");

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureMaintainServiceImpl.java

@@ -5,14 +5,9 @@ import java.util.Date;
 import java.util.List;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.yeejoin.amos.boot.module.common.api.dto.FailureAuditDto;
 
-import com.yeejoin.amos.boot.module.common.api.entity.FailureAudit;
 import org.apache.commons.lang3.ObjectUtils;
 
-import org.slf4j.Logger;
-
-import org.slf4j.LoggerFactory;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -20,14 +15,8 @@ import org.springframework.stereotype.Service;
 
 import org.springframework.transaction.annotation.Transactional;
 
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
-
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService;
 import com.yeejoin.amos.boot.module.common.api.dto.FailureDetailsDto;
@@ -38,8 +27,6 @@ import com.yeejoin.amos.boot.module.common.api.dto.FailureRepairlogDto;
 
 import com.yeejoin.amos.boot.module.common.api.entity.FailureMaintain;
 
-import com.yeejoin.amos.boot.module.common.api.enums.AuditResultEnum;
-
 import com.yeejoin.amos.boot.module.common.api.enums.FailureStatuEnum;
 
 import com.yeejoin.amos.boot.module.common.api.mapper.FailureMaintainMapper;

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureRepairlogServiceImpl.java

@@ -5,12 +5,10 @@ import java.util.List;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
-
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.common.api.dto.FailureRepairlogDto;
-import com.yeejoin.amos.boot.module.common.api.entity.FailureAudit;
 import com.yeejoin.amos.boot.module.common.api.entity.FailureRepairlog;
 import com.yeejoin.amos.boot.module.common.api.mapper.FailureRepairlogMapper;
 import com.yeejoin.amos.boot.module.common.api.service.IFailureRepairlogService;

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -435,7 +436,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         OrgUsrFormDto formDto = this.selectCompanyById(orgUsr.getSequenceNbr());
         if (OrgPersonEnum.公司.getKey().equals(orgUsr.getBizOrgType())) {
             try {
-                emqKeeper.getMqttClient().publish(airportAddTopic, formDto.toString().getBytes(), 2, true);
+                emqKeeper.getMqttClient().publish(airportAddTopic, JSON.toJSONString(formDto).getBytes(), 2, false);
             } catch (Exception e) {
                 e.getMessage();
             }

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/dao/mapper/CheckMapper.java

@@ -279,7 +279,7 @@ public interface CheckMapper extends BaseMapper {
 
 	long getCheckCount(HashMap<String, Object> params);
 
-	List<HashMap<String, Object>> getChecks(HashMap<String, Object> params);
+	List<Map<String, Object>> getChecks(HashMap<String, Object> params);
 
 	Map<String, Object> getCheckDetail(@Param(value = "id") String id);
 

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

@@ -1090,8 +1090,8 @@ public class CheckServiceImpl implements ICheckService {
     }
 
     @Override
-    public Page<HashMap<String, Object>> getCheckPage(HashMap<String, Object> params, CommonPageable page) {
-        List<HashMap<String, Object>> content = Lists.newArrayList();
+    public Page<Map<String, Object>> getCheckPage(HashMap<String, Object> params, CommonPageable page) {
+        List<Map<String, Object>> content = Lists.newArrayList();
         long total = checkMapper.getCheckCount(params);
         if (total == 0) {
             return new PageImpl<>(content, page, total);
@@ -1100,7 +1100,7 @@ public class CheckServiceImpl implements ICheckService {
         params.put("pageSize", page.getPageSize());
         content = checkMapper.getChecks(params);
         if (0 < content.size()) {
-            for (HashMap<String, Object> map : content) {
+            for (Map<String, Object> map : content) {
                 if (map.containsKey("isOk")) {
                     map.put("status", CheckStatusEnum.getEnum(String.valueOf(map.get("isOk"))).getName());
                 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/intfc/ICheckService.java

@@ -258,7 +258,7 @@ public interface ICheckService {
      */
     Map<String,CheckRecordDto> obtainLastCheckRecord(String[] relationId);
 
-    Page<HashMap<String, Object>> getCheckPage(HashMap<String, Object> map, CommonPageable pageable);
+    Page<Map<String, Object>> getCheckPage(HashMap<String, Object> map, CommonPageable pageable);
 
     Map<String, Object> getCheckDetail(String id);
     /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/jpush/AppMessagePushService.java

 package com.yeejoin.amos.maintenance.jpush;
 
+import cn.jpush.api.JPushClient;
+import cn.jpush.api.push.model.PushPayload;
+import com.yeejoin.amos.maintenance.business.constants.XJConstant;
+import com.yeejoin.amos.maintenance.business.param.PushMsgParam;
 import com.yeejoin.amos.maintenance.business.util.CommonResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -7,23 +11,17 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
-import com.yeejoin.amos.maintenance.business.constants.XJConstant;
-import com.yeejoin.amos.maintenance.business.param.PushMsgParam;
-
-import cn.jpush.api.JPushClient;
-import cn.jpush.api.push.model.PushPayload;
-
 
 @Service
 public class AppMessagePushService {
 
-	
-	protected static final Logger log = LoggerFactory
-			.getLogger(AppMessagePushService.class);
 
-	
-	    @Autowired
-	    private com.yeejoin.amos.maintenance.feign.PushFeign PushFeign;
+    protected static final Logger log = LoggerFactory
+            .getLogger(AppMessagePushService.class);
+
+
+    @Autowired
+    private com.yeejoin.amos.maintenance.feign.PushFeign PushFeign;
 //	private static String APP_KEY;
 //	    
 //    private static String MASTER_SECRET;
@@ -36,20 +34,21 @@ public class AppMessagePushService {
 //    public void setMasterSecret(String masterSecret) {
 //        this.MASTER_SECRET = masterSecret;
 //    }
-	
-	@Value("${params.isPush}")
-	private String isPush;
-
-	protected static final String APP_KEY = "1b3f7b961200f4b236811dfe";
-	protected static final String MASTER_SECRET = "8b650e645fb3a43c96be02b2";
-	//
-
-	private static JPushClient jpushClient = new JPushClient(MASTER_SECRET,
-			APP_KEY);
-	 public static String buildJpushUserKey(String userId) {
-	        return XJConstant.JPUSH_USER_KEY + "_" + userId;
-	    }
-	    
+
+    @Value("${params.isPush}")
+    private String isPush;
+
+    protected static final String APP_KEY = "1b3f7b961200f4b236811dfe";
+    protected static final String MASTER_SECRET = "8b650e645fb3a43c96be02b2";
+    //
+
+    private static JPushClient jpushClient = new JPushClient(MASTER_SECRET,
+            APP_KEY);
+
+    public static String buildJpushUserKey(String userId) {
+        return XJConstant.JPUSH_USER_KEY + "_" + userId;
+    }
+
 //	private static JPushClient jpushClient = null;
 //
 //	public static JPushClient getJPushClient(String APP_KEY, String MASTER_SECRET) {
@@ -61,29 +60,29 @@ public class AppMessagePushService {
 //	}
 
 
-	/*public void sendMessage(List<PushMsgParam> responses)
-	{
-		PushFeign.sendMessage(responses);
-		try
-		{
-			if(responses!=null && "true".equals(isPush))
-			{
-				for(PushMsgParam response:responses)
-				{
-					PushPayload payload = buildPushPayload(response);
-					jpushClient.sendPush(payload);
-				}
-			}
-		}
-		catch (Exception e){
-			log.error(e.getMessage(),e);
-			e.printStackTrace();
-		}
-	}
+    /*public void sendMessage(List<PushMsgParam> responses)
+    {
+        PushFeign.sendMessage(responses);
+        try
+        {
+            if(responses!=null && "true".equals(isPush))
+            {
+                for(PushMsgParam response:responses)
+                {
+                    PushPayload payload = buildPushPayload(response);
+                    jpushClient.sendPush(payload);
+                }
+            }
+        }
+        catch (Exception e){
+            log.error(e.getMessage(),e);
+            e.printStackTrace();
+        }
+    }
 */
-	private PushPayload buildPushPayload(PushMsgParam response) {
-		CommonResponse commonResponse = PushFeign.buildPushPayload(response);
-    	return (PushPayload)commonResponse.getDataList();
+    private PushPayload buildPushPayload(PushMsgParam response) {
+        CommonResponse commonResponse = PushFeign.buildPushPayload(response);
+        return (PushPayload) commonResponse.getDataList();
 		/*if(JPushTypeEnum.ALL.getCode().equals(response.getType())){
 			return PushPayload.newBuilder()
 					.setPlatform(Platform.android())
@@ -102,19 +101,19 @@ public class AppMessagePushService {
 					.build();
 		}*/
 
-	}
-
-	public void sendMessage(PushMsgParam response){
-		
-		try {
-			if(null!=response && "true".equals(isPush)){
-				CommonResponse  commonResponse = PushFeign.sendMessageone(response);
-			}
-		} catch (Exception e) {
-			log.error(e.getMessage(),e);
-			e.printStackTrace();
-		
-		}
-	}
+    }
+
+    public void sendMessage(PushMsgParam response) {
+
+        try {
+            if (null != response && "true".equals(isPush)) {
+                CommonResponse commonResponse = PushFeign.sendMessageone(response);
+            }
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            e.printStackTrace();
+
+        }
+    }
 
 }

amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml

@@ -100,10 +100,10 @@
 
 	<changeSet author="chenhao" id="2021-08-26-chenhao-1">
 		<preConditions onFail="MARK_RAN">
-		<not>
-		<columnExists tableName="cb_firefighters_contract" columnName="start_time"/>
-		</not>
-		</preConditions>
+			<not>
+				<columnExists tableName="cb_firefighters_contract" columnName="start_time"/>
+			</not>
+	</preConditions>
 		<comment>modify table cb_firefighters_contract add one columns</comment>
 		<sql>
 			ALTER TABLE `cb_firefighters_contract` ADD start_time date COMMENT '起始时间';

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

@@ -1912,12 +1912,13 @@
                 pp.belong_system_name systemName,
                 pp.address address,
                 pp.original_id equipId,
-                CONCAT(pp.address, pp.building_name) buildingName,
+                CONCAT_WS('',pp.building_name,pp.address) buildingName,
                 pc.org_code AS orgCode
             FROM p_check pc
             LEFT JOIN p_point pp ON pp.id = pc.point_id
         ) a
         <include refid="mobile-check-record-where" />
+        order by checkDate
         limit #{offset},#{pageSize}
     </select>
 
@@ -1947,20 +1948,20 @@
             <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''  ">
                 AND (
                 (
-                a.beginTime <![CDATA[>=]]>  #{beginTime}
-                AND a.endTime <![CDATA[<=]]> #{endTime}
+                a.checkDate <![CDATA[>=]]>  #{beginTime}
+                AND a.checkDate <![CDATA[<=]]> #{endTime}
                 )
                 OR (
-                a.beginTime <![CDATA[<=]]> #{endTime}
-                AND a.endTime <![CDATA[>=]]> #{endTime}
+                a.checkDate <![CDATA[<=]]> #{endTime}
+                AND a.checkDate <![CDATA[>=]]> #{endTime}
                 )
                 OR (
-                a.beginTime <![CDATA[<=]]> #{beginTime}
-                AND a.endTime <![CDATA[>]]> #{beginTime}
+                a.checkDate <![CDATA[<=]]> #{beginTime}
+                AND a.checkDate <![CDATA[>]]> #{beginTime}
                 )
                 OR (
-                a.beginTime <![CDATA[<=]]> #{beginTime}
-                AND a.endTime <![CDATA[>=]]> #{endTime}
+                a.checkDate <![CDATA[<=]]> #{beginTime}
+                AND a.checkDate <![CDATA[>=]]> #{endTime}
                 )
                 )
             </if>
@@ -2013,7 +2014,7 @@
         pp.belong_system_id systemId,
         pp.belong_system_name systemName,
         pp.address address,
-        CONCAT(pp.address, pp.building_name) buildingName,
+        CONCAT_WS('',pp.building_name,pp.address) buildingName,
         pc.org_code AS orgCode
         FROM p_check pc
         LEFT JOIN p_point pp ON pp.id = pc.point_id

pom.xml

@@ -26,7 +26,7 @@
 		<springboot.version>2.3.11.RELEASE</springboot.version>
 		<springcloud.version>Hoxton.SR8</springcloud.version>
 		<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
-		<tyboot-version>1.1.20Ty-SNAPSHOT</tyboot-version>
+		<tyboot-version>1.1.20</tyboot-version>
 		<amos.version>1.6.0</amos.version>
 		<itext.version>7.1.1</itext.version>
 	</properties>