1.app bug修改

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

@@ -3,8 +3,6 @@ package com.yeejoin.amos.maintenance.business.controller;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.maintenance.business.constants.XJConstant;
 import com.yeejoin.amos.maintenance.business.dto.CheckDto;
-import com.yeejoin.amos.maintenance.business.dto.CheckInputDto;
-import com.yeejoin.amos.maintenance.business.dto.CheckShotDto;
 import com.yeejoin.amos.maintenance.business.param.CheckInfoPageParam;
 import com.yeejoin.amos.maintenance.business.param.CheckRecordParam;
 import com.yeejoin.amos.maintenance.business.param.CheckStatisticalParam;
@@ -13,6 +11,7 @@ import com.yeejoin.amos.maintenance.business.util.*;
 import com.yeejoin.amos.maintenance.business.vo.CheckAnalysisVo;
 import com.yeejoin.amos.maintenance.business.vo.CheckInfoVo;
 import com.yeejoin.amos.maintenance.common.enums.CheckRecordOrderByEnum;
+import com.yeejoin.amos.maintenance.common.enums.CheckStatusEnum;
 import com.yeejoin.amos.maintenance.core.async.AsyncTask;
 import com.yeejoin.amos.maintenance.core.common.request.CommonPageable;
 import com.yeejoin.amos.maintenance.core.common.request.CommonRequest;
@@ -80,10 +79,11 @@ public class CheckController extends AbstractBaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PersonIdentify
     @ApiOperation(value = "巡检记录查询", notes = "巡检记录查询")
     @RequestMapping(value = "/list", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
     public CommonResponse qryCheckInfoPage(
-            @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
+            @ApiParam(value = "查询条件") @RequestBody(required = false) List<CommonRequest> queryRequests,
             @ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) {
         ReginParams reginParams = getSelectedOrgInfo();
         String orgCode = getOrgCode(reginParams);
@@ -307,7 +307,7 @@ public class CheckController extends AbstractBaseController {
     @ApiOperation(value = "维保日历-mobile", notes = "维保日历-mobile")
     @GetMapping(value = "/{date}/checkCalendar", produces = "application/json;charset=UTF-8")
     public CommonResponse checkCalendar(
-            @ApiParam(value = "date,格式YYYY-MM-DD",required = true)@PathVariable String date) {
+            @ApiParam(value = "date,格式YYYY-MM-DD", required = true) @PathVariable String date) {
         Map<String, Object> params = new HashMap<>();
         ReginParams reginParams = getSelectedOrgInfo();
         String loginOrgCode = getOrgCode(reginParams);
@@ -480,7 +480,7 @@ public class CheckController extends AbstractBaseController {
         return CommonResponseUtil.success(checkService.obtainLastCheckRecord(relationId));
     }
 
-    @PersonIdentify(isNeedIdentity = true)
+    @PersonIdentify
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "维保记录分页查询", notes = "维保记录分页查询")
     @GetMapping(value = "/page")
@@ -492,10 +492,10 @@ public class CheckController extends AbstractBaseController {
             @ApiParam(value = "开始时间") @RequestParam(value = "beginTime", required = false) String beginTime,
             @ApiParam(value = "结束时间") @RequestParam(value = "endTime", required = false) String endTime,
             @ApiParam(value = "维保人员") @RequestParam(value = "personId", required = false) String person,
-            @ApiParam(value = "业主单位") @RequestParam(value = "teamId", required = false) String teamId,
+            @ApiParam(value = "业主单位") @RequestParam(value = "companyId", required = false) String companyId,
             @ApiParam(value = "设施Id") @RequestParam(value = "equipId", required = false) String equipId,
             @ApiParam(value = "当前页") @RequestParam(value = "pageNumber") int pageNumber,
-            @ApiParam(value = "页大小") @RequestParam(value = "pageSize") int pageSize) throws Exception{
+            @ApiParam(value = "页大小") @RequestParam(value = "pageSize") int pageSize) throws Exception {
         HashMap<String, Object> params = new HashMap<>();
         ReginParams reginParams = getSelectedOrgInfo();
         String loginOrgCode = getOrgCode(reginParams);
@@ -510,7 +510,7 @@ public class CheckController extends AbstractBaseController {
         params.put("beginTime", beginTime);
         params.put("endTime", endTime);
         params.put("person", person);
-        params.put("teamId", teamId);
+        params.put("companyId", companyId);
         params.put("equipId", equipId);
         params.put("orgCode", loginOrgCode);
         CommonPageable pageable = new CommonPageable(pageNumber, pageSize);
@@ -521,7 +521,7 @@ public class CheckController extends AbstractBaseController {
     @ApiOperation(value = "维保记录详情", notes = "维保记录详情")
     @GetMapping(value = "/detail/{id}")
     public CommonResponse getCheckDetail(
-            @ApiParam(value = "记录Id") @PathVariable(value = "id") String id) throws Exception{
+            @ApiParam(value = "记录Id") @PathVariable(value = "id") String id) throws Exception {
         return CommonResponseUtil.success(checkService.getCheckDetail(id));
     }
 
@@ -532,21 +532,28 @@ public class CheckController extends AbstractBaseController {
         return ResponseHelper.buildResponse(CheckRecordOrderByEnum.getEnumList());
     }
 
-    @ApiOperation(value = "/设备设施维保记录分页列表",notes = "外部接口装备和者水源使用")
+    @ApiOperation(value = "/设备设施维保记录分页列表", notes = "外部接口装备和者水源使用")
     @GetMapping(value = "page/{originalId}/list")
     public ResponseModel getCheckListByOriginalId(
             @PathVariable String originalId,
             @RequestParam(value = "current") int pageNum,
             @RequestParam(value = "size") int pageSize
-            ){
-        CommonPageable pageable = new CommonPageable(pageNum,pageSize);
-        return ResponseHelper.buildResponse(checkService.getCheckListByOriginalId(originalId,pageable));
+    ) {
+        CommonPageable pageable = new CommonPageable(pageNum, pageSize);
+        return ResponseHelper.buildResponse(checkService.getCheckListByOriginalId(originalId, pageable));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "web端维保记录详情")
     @GetMapping(value = "input/{checkId}/detail")
-    public ResponseModel inputDetail(@ApiParam(value = "记录主表id") @PathVariable String checkId){
+    public ResponseModel inputDetail(@ApiParam(value = "记录主表id") @PathVariable String checkId) {
         return ResponseHelper.buildResponse(checkService.getInputDetail(checkId));
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "维保检查结果下拉列表")
+    @GetMapping(value = "/isOk-list")
+    public ResponseModel statusList() {
+        return ResponseHelper.buildResponse(CheckStatusEnum.getEnumList());
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/PointController.java

 package com.yeejoin.amos.maintenance.business.controller;
 
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
-import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.maintenance.business.dto.PointDto;
 import com.yeejoin.amos.maintenance.business.param.PointImportParam;
 import com.yeejoin.amos.maintenance.business.param.PointImportQueryParam;
@@ -636,10 +635,9 @@ public class PointController extends AbstractBaseController {
     public CommonResponse syncSavePoint(
             @ApiParam(value = "同步请求参数") @RequestBody() List<MaintenanceResourceData> list) {
         ReginParams reginParams = getSelectedOrgInfo();
-        AgencyUserModel model = getUserInfo();
-        String orgCode = getOrgCode(reginParams);
-        iPointService.syncSavePoint(list, orgCode, model.getUserId());
+        iPointService.syncSavePoint(list, reginParams);
         return CommonResponseUtil.success();
     }
 
+
 }

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Sequence;
 import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.maintenance.business.constants.XJConstant;
 import com.yeejoin.amos.maintenance.business.dao.mapper.InputItemMapper;
@@ -35,11 +36,11 @@ import org.springframework.data.domain.*;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.domain.Sort.Order;
 import org.springframework.data.jpa.domain.Specification;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 
 import javax.annotation.Resource;
@@ -273,7 +274,7 @@ public class PointServiceImpl implements IPointService {
     public Point updatePoint(PointParam pointParam) {
         //1.更新点
         long pointId = pointParam.getPoint().getId();
-        Point newPoint = iPointDao.findById(pointId).orElseThrow(()->new RuntimeException("找不到原始数据"));
+        Point newPoint = iPointDao.findById(pointId).orElseThrow(() -> new RuntimeException("找不到原始数据"));
         Bean.copyExistPropertis(pointParam.getPoint(), newPoint);
         newPoint.setLastUpdateTime(new Date());
         iPointDao.save(newPoint);
@@ -1087,25 +1088,10 @@ public class PointServiceImpl implements IPointService {
 
 
     @Override
-    @Async
-    public void syncSavePoint(List<MaintenanceResourceData> list, String orgCode, String userId) {
+    public void syncSavePoint(List<MaintenanceResourceData> list, ReginParams reginParams) {
         List<Point> points = new ArrayList<>();
         List<PointInputItem> inputItems = new ArrayList<>();
-        List<Long> ids = new ArrayList<>();
-        //1.删除已有数据
-        for (MaintenanceResourceData x : list) {
-            String pointNo = x.getFireFacilityCode();
-            String originalId = String.valueOf(x.getFireFacilityId());
-            Long id = iPointDao.findPointByEquipmentIdAndFireFacilityId(pointNo, originalId);
-            if (null != id) {
-                ids.add(id);
-            }
-        }
-        if (!ids.isEmpty()) {
-            Long[] idsArray = ids.toArray(new Long[0]);
-            delPointById(idsArray);
-        }
-        //2.创建
+        //1.创建
         for (MaintenanceResourceData x : list) {
             Point point = new Point();
             String pointNo = StringUtil.isNotEmpty(x.getFireFacilityCode()) ? x.getFireFacilityCode() : String.valueOf(sequence.nextId());
@@ -1123,11 +1109,14 @@ public class PointServiceImpl implements IPointService {
             point.setBuildingName(x.getBuildingName());
             point.setAddress(x.getArea());
             point.setLevel("");
-            point.setCreatorId(userId);
-            point.setOrgCode(orgCode);
+            point.setCreatorId(RequestContext.getExeUserId());
+            //TODO BUG orgCode 取值 没值来源
+            point.setOrgCode(reginParams.getCompany().getOrgCode());
+            point.setCompanyId(String.valueOf(x.getMaintenanceCompanyId()));
+            point.setCompanyName(x.getMaintenanceCompanyName());
             points.add(point);
             iPointDao.save(point);
-            List<InputItem> inputItemVos = inputItemMapper.getInputItemByEquipmentName(x.getClassifyName(), orgCode);
+            List<InputItem> inputItemVos = inputItemMapper.getInputItemByEquipmentName(x.getClassifyName(), null);
             if (0 < inputItemVos.size()) {
                 inputItemVos.forEach(y -> {
                     PointInputItem inputItem = new PointInputItem();

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

 package com.yeejoin.amos.maintenance.business.service.intfc;
 
 import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.maintenance.business.dto.PointDto;
 import com.yeejoin.amos.maintenance.business.param.*;
 import com.yeejoin.amos.maintenance.business.util.DaoCriteria;
@@ -299,7 +300,6 @@ public interface IPointService {
 
     LinkedHashMap<String,Object> getRegionTress();
 
-    void syncSavePoint(List<MaintenanceResourceData> list, String orgCode, String userId);
     /**
      * 查询巡检点及点及点的项
      * @param queryRequests 请求参数
@@ -309,4 +309,5 @@ public interface IPointService {
      */
     Page<PointDto> queryPointInfoWithItem(List<DaoCriteria> queryRequests, CommonPageable commonPageable, Long ownerId);
 
+    void syncSavePoint(List<MaintenanceResourceData> list, ReginParams reginParams);
 }

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

 package com.yeejoin.amos.maintenance.business.service.intfc;
 
-import com.yeejoin.amos.maintenance.business.param.SynInputItemParam;
-import com.yeejoin.amos.maintenance.business.util.CommonResponse;
-import com.yeejoin.amos.maintenance.business.util.Toke;
-import com.yeejoin.amos.maintenance.business.param.SynPlanParam;
-import com.yeejoin.amos.maintenance.business.param.SynPointParam;
-import com.yeejoin.amos.maintenance.business.param.SynRouteParam;
+import java.util.List;
 
 public interface ISynDataService {
 
-    CommonResponse saveInputItem(SynInputItemParam synInputItemParam, String userId, String orgCode);
-
-    CommonResponse updateInputItem(SynInputItemParam synInputItemParam);
-
-    CommonResponse deleteInputItem(SynInputItemParam synInputItemParam);
-
-    CommonResponse saveSinglePoint(SynPointParam synPointParam, String userId, String orgCode);
-
-    CommonResponse updateSinglePoint(SynPointParam synPointParam);
-
-    CommonResponse deleteSinglePoint(SynPointParam synPointParam);
-
-    CommonResponse synPointItemRelation(SynPointParam synPointParam, Boolean isSave, String userId);
-
-    CommonResponse saveRoute(SynRouteParam synRouteParam, String userId, String orgCode);
-
-    CommonResponse updateRoute(SynRouteParam synRouteParam, String userId, String orgCode);
-
-    CommonResponse savePlan(SynPlanParam synPlanParam, String userId, String orgCode, Toke toke);
-
-    CommonResponse updatePlan(SynPlanParam synPlanParam, String userId, String orgCode);
-
-    CommonResponse stopPlan(String originalId);
-
-    CommonResponse getPlanFinishTimes(String originalIds);
-
+    /**
+     * 删除维保项(原巡检点)
+     * @param ids 原ids
+     * @return Boolean
+     */
+    List<Long> pointDelete(String ids);
 }

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

@@ -421,14 +421,12 @@ public class CheckController extends AbstractBaseController {
     @ApiOperation(value = "获取巡检日历数据<font color='blue'>手机app</font>", notes = "获取巡检日历数据<font color='blue'>手机app</font>")
     @PostMapping(value = "/checkCalendar", produces = "application/json;charset=UTF-8")
     public CommonResponse checkCalendar(
-            @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests) {
+            @ApiParam(value = "查询条件") @RequestBody(required = false) List<CommonRequest> queryRequests) {
         try {
             ReginParams reginParams = getSelectedOrgInfo();
             String loginOrgCode = getOrgCode(reginParams);
             String roleTypeName = getRoleTypeName(reginParams);
             List<DaoCriteria> daoCriterias = buildDaoCriterias(queryRequests, true, loginOrgCode, roleTypeName);
-
-
             Map<String, Object> map = checkService.checkCalendar(CheckParamUtil.checkCalendar(daoCriterias));
             return CommonResponseUtil.success(map);
         } catch (Exception e) {

amos-boot-system-maintenance/src/main/java/com/yeejoin/amos/MaintenanceApplication.java

 package com.yeejoin.amos;
 
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.URISyntaxException;
-import java.net.UnknownHostException;
-
 import org.mybatis.spring.annotation.MapperScan;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -25,6 +20,11 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.springframework.web.client.RestTemplate;
 import org.typroject.tyboot.core.restful.exception.GlobalExceptionHandler;
 
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.URISyntaxException;
+import java.net.UnknownHostException;
+
 /**
  * <pre>
  * 服务启动类

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

@@ -266,7 +266,7 @@
         ELSE
         0
         END
-        ),0) AS "qualified",
+        ),0) AS '合格',
         COALESCE(SUM(
         CASE
         WHEN is_ok = '2' THEN
@@ -274,7 +274,7 @@
         ELSE
         0
         END
-        ),0) AS "unqualified",
+        ),0) AS '不合格',
         COALESCE(SUM(
         CASE
         WHEN is_ok = '3' THEN
@@ -282,8 +282,7 @@
         ELSE
         0
         END
-        ),0) AS "omission",
-        COUNT(id) count
+        ),0) AS '漏检'
         FROM
         p_check
         <include refid="calendar-where"/>
@@ -1968,10 +1967,10 @@
             <choose>
                 <when test="identityType==1">
                     And (a.orgCode LIKE CONCAT( #{orgCode}, '-%' ) or a.orgCode= #{orgCode} )
-                    <if test="companyId != null"> and a.ownerId = #{teamId}</if>
+                    <if test="companyId != null and companyId != ''"> and a.ownerId = #{companyId}</if>
                 </when>
                 <when test="identityType==2">
-                    And a.ownerId = #{teamId}
+                    And a.ownerId = #{companyId}
                 </when>
             </choose>
         </where>
@@ -2022,6 +2021,7 @@
         <include refid="mobile-check-record-where" />
     </select>
 
+    
     <select id="getCheckDetail" resultType="Map">
         SELECT
             pc.id checkId,