Skip to content

A
amos-boot-biz
Commit d2e9703d authored by suhuiguang's avatar suhuiguang
Browse files
Options

1.维保任务-消息推送

parent ad254e17
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 30 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/feign/EquipFeign.java → amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/feign/EquipFeignClient.java
View file @ d2e9703d
package com.yeejoin.amos.maintenance.business.feign;
import com.yeejoin.amos.maintenance.business.util.CommonResponse;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
//装备
@FeignClient(name = "${equip.fegin.name}")
public interface EquipFeign {
@RequestMapping(value = "${equip.fegin.prefix}" + "/equipSpecific/getSourceNameByEquipSpeId", method = RequestMethod.GET, consumes = "application/json")
LinkedHashMap<String, Object> getEquipDetail(@RequestParam(value = "id", required = true) Long id);
/**
* @author DELL
*/ //装备
@FeignClient(name = "${equip.feign.name}")
public interface EquipFeignClient {
String PREFIX = "${equip.feign.prefix}";
@RequestMapping(value = "${equip.fegin.prefix}" + "/equipSpecific/getSourceNameList", method = RequestMethod.POST, consumes = "application/json")
@RequestMapping(value = PREFIX + "/equipSpecific/getSourceNameByEquipSpeId", method = RequestMethod.GET, consumes = "application/json")
LinkedHashMap<String, Object> getEquipDetail(@RequestParam(value = "id") Long id);
@RequestMapping(value = PREFIX + "/equipSpecific/getSourceNameList", method = RequestMethod.POST, consumes = "application/json")
LinkedHashMap<String, Object> getEquipList(@RequestBody Long id);
@RequestMapping(value = "${equip.fegin.prefix}" + "/warehouse-structure/listAll", method = RequestMethod.GET, consumes = "application/json")
@RequestMapping(value = PREFIX + "/warehouse-structure/listAll", method = RequestMethod.GET, consumes = "application/json")
String getStructureNameAll();
/**
......@@ -24,10 +30,10 @@ public interface EquipFeign {
*
* @return
*/
@RequestMapping(value = "${equip.fegin.prefix}" + "/building/tree", method = RequestMethod.GET, consumes = "application/json")
@RequestMapping(value = PREFIX + "/building/tree", method = RequestMethod.GET, consumes = "application/json")
LinkedHashMap<String, Object> getBuildingTree();
@RequestMapping(value = "${equip.fegin.prefix}" + "/building/getBuildingAbsolutePosition", method = RequestMethod.GET, consumes = "application/json")
@RequestMapping(value = PREFIX + "/building/getBuildingAbsolutePosition", method = RequestMethod.GET, consumes = "application/json")
LinkedHashMap<String, Object> getBuildingAbsolutePosition();
/**
......@@ -35,7 +41,7 @@ public interface EquipFeign {
*
* @return
*/
@RequestMapping(value = "${equip.fegin.prefix}" + "/area/tree", method = RequestMethod.GET, consumes = "application/json")
@RequestMapping(value = PREFIX + "/area/tree", method = RequestMethod.GET, consumes = "application/json")
LinkedHashMap<String, Object> getRegionTress();
/**
......@@ -45,7 +51,7 @@ public interface EquipFeign {
* @param id
* @return
*/
@GetMapping(value = "${equip.fegin.prefix}+/maintenanceResourceData/getFireFacilityList")
List<Map<String, Object>> overTimeMaintenanceFacility(@RequestParam String type, @RequestParam String id);
@GetMapping(value = PREFIX+"/maintenanceResourceData/getFireFacilityList")
ResponseModel<List<Map<String, Object>>> overTimeMaintenanceFacility(@RequestParam String type, @RequestParam 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
View file @ d2e9703d
......@@ -21,7 +21,7 @@ import com.yeejoin.amos.maintenance.business.dto.CheckDto;
import com.yeejoin.amos.maintenance.business.dto.CheckRecordDto;
import com.yeejoin.amos.maintenance.business.dto.CheckShotDto;
import com.yeejoin.amos.maintenance.business.entity.mybatis.*;
import com.yeejoin.amos.maintenance.business.feign.EquipFeign;
import com.yeejoin.amos.maintenance.business.feign.EquipFeignClient;
import com.yeejoin.amos.maintenance.business.param.*;
import com.yeejoin.amos.maintenance.business.service.intfc.ICheckService;
import com.yeejoin.amos.maintenance.business.service.intfc.IEquipmentHandlerService;
......@@ -246,8 +246,8 @@ public class CheckServiceImpl implements ICheckService {
//6.消息广播最近维保日期
if(StringUtil.isNotEmpty(point.getOriginalId())){
JSONObject jsonObject = new JSONObject();
jsonObject.put("facilityId",point.getOriginalId());
jsonObject.put("checkTime",check.getCheckTime());
jsonObject.put("fireFacilityId",point.getOriginalId());
jsonObject.put("maintenanceTime",check.getCheckTime());
mqttGateway.publish(CHECK_UPDATE_TOPIC,jsonObject.toJSONString());
}
//7.返回不合格记录
......@@ -950,7 +950,7 @@ public class CheckServiceImpl implements ICheckService {
}
@Autowired
private EquipFeign equipment;
private EquipFeignClient equipment;
@Override
public List<HashMap<String, Object>> getEquipByCheckId(CheckDetailInputPageParam param) {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/impl/MessageServiceImpl.java
View file @ d2e9703d
......@@ -23,7 +23,7 @@ import com.yeejoin.amos.maintenance.business.dao.repository.IMsgDao;
import com.yeejoin.amos.maintenance.business.dao.repository.IPlanTaskDetailDao;
import com.yeejoin.amos.maintenance.business.dao.repository.IPointDao;
import com.yeejoin.amos.maintenance.business.dao.repository.IRouteDao;
import com.yeejoin.amos.maintenance.business.feign.EquipFeign;
import com.yeejoin.amos.maintenance.business.feign.EquipFeignClient;
import com.yeejoin.amos.maintenance.business.service.intfc.IMessageService;
import com.yeejoin.amos.maintenance.business.util.StringUtil;
import com.yeejoin.amos.maintenance.business.vo.MsgVo;
......@@ -106,7 +106,7 @@ public class MessageServiceImpl implements IMessageService {
private RemoteSecurityService remoteSecurityService;
@Autowired
private EquipFeign equipFeign;
private EquipFeignClient equipFeign;
@Override
public void pushCheckMessage(String toke,String product,String appKey,Long checkId) {
try{
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/impl/PlanTaskServiceImpl.java
View file @ d2e9703d
......@@ -14,7 +14,7 @@ import com.yeejoin.amos.maintenance.business.dao.mapper.PlanTaskMapper;
import com.yeejoin.amos.maintenance.business.dao.repository.*;
import com.yeejoin.amos.maintenance.business.entity.mybatis.CheckChkExListBo;
import com.yeejoin.amos.maintenance.business.entity.mybatis.PointCheckDetailBo;
import com.yeejoin.amos.maintenance.business.feign.EquipFeign;
import com.yeejoin.amos.maintenance.business.feign.EquipFeignClient;
import com.yeejoin.amos.maintenance.business.param.CheckPtListPageParam;
import com.yeejoin.amos.maintenance.business.param.PlanTaskPageParam;
import com.yeejoin.amos.maintenance.business.service.intfc.ICheckService;
......@@ -81,7 +81,7 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
private ICheckService checkService;
@Autowired
private EquipFeign equipFeign;
private EquipFeignClient equipFeign;
@Autowired
IPointDao iPointDao;
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/impl/PointServiceImpl.java
View file @ d2e9703d
......@@ -3,7 +3,6 @@ package com.yeejoin.amos.maintenance.business.service.impl;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.toolkit.Sequence;
import com.baomidou.mybatisplus.extension.api.R;
import com.google.common.base.Joiner;
import com.google.common.collect.Lists;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
......@@ -14,7 +13,7 @@ import com.yeejoin.amos.maintenance.business.dao.mapper.RouteMapper;
import com.yeejoin.amos.maintenance.business.dao.repository.*;
import com.yeejoin.amos.maintenance.business.dto.PointDto;
import com.yeejoin.amos.maintenance.business.entity.mybatis.CheckPtListBo;
import com.yeejoin.amos.maintenance.business.feign.EquipFeign;
import com.yeejoin.amos.maintenance.business.feign.EquipFeignClient;
import com.yeejoin.amos.maintenance.business.param.*;
import com.yeejoin.amos.maintenance.business.service.intfc.IPointService;
import com.yeejoin.amos.maintenance.business.util.DaoCriteria;
......@@ -92,7 +91,7 @@ public class PointServiceImpl implements IPointService {
@Autowired
private RemoteSecurityService remoteSecurityService;
@Autowired
private EquipFeign equipFeign;
private EquipFeignClient equipFeign;
@Autowired
Sequence sequence;
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/impl/StatisticsServiceImpl.java
View file @ d2e9703d
......@@ -2,14 +2,14 @@ package com.yeejoin.amos.maintenance.business.service.impl;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.maintenance.business.dao.mapper.PlanTaskMapper;
import com.yeejoin.amos.maintenance.business.feign.EquipFeign;
import com.yeejoin.amos.maintenance.business.feign.EquipFeignClient;
import com.yeejoin.amos.maintenance.business.service.intfc.IStatisticsService;
import com.yeejoin.amos.maintenance.common.enums.PlanTaskDetailIsFinishEnum;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.foundation.utils.Bean;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
......@@ -24,7 +24,7 @@ public class StatisticsServiceImpl implements IStatisticsService {
@Autowired
PlanTaskMapper planTaskMapper;
@Autowired
EquipFeign equipFeign;
EquipFeignClient equipFeign;
@Override
public Map<String, Object> taskStatusStatistics(ReginParams.PersonIdentity opIdentifyInfo, String orgCode) {
......@@ -37,8 +37,8 @@ public class StatisticsServiceImpl implements IStatisticsService {
resultMap.put("waitExecuteTask", statusNumberMap.get(PlanTaskDetailIsFinishEnum.UNFINISHED.getValue()) == null ? 0L : statusNumberMap.get(PlanTaskDetailIsFinishEnum.UNFINISHED.getValue()));
// 超时任务数量
resultMap.put("overTimeTask", statusNumberMap.get(PlanTaskDetailIsFinishEnum.OVERTIME.getValue()) == null ? 0L : statusNumberMap.get(PlanTaskDetailIsFinishEnum.OVERTIME.getValue()));
List<Map<String, Object>> overTimeFacility = new ArrayList<>();
//overTimeFacility = equipFeign.overTimeMaintenanceFacility(opIdentifyInfo.getIdentityType(),opIdentifyInfo.getCompanyId());
ResponseModel<List<Map<String, Object>>> response = equipFeign.overTimeMaintenanceFacility(opIdentifyInfo.getIdentityType(),opIdentifyInfo.getCompanyId());
List<Map<String, Object>> overTimeFacility = response.getResult();
// 到期维保设备
resultMap.put("overTimeFacility", overTimeFacility.size());
return resultMap;
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/core/framework/PersonIdentify.java
View file @ d2e9703d
......@@ -19,6 +19,6 @@ public @interface PersonIdentify {
* 是否进行人员校验
* @return
*/
boolean isNeedIdentity() default false;
boolean isNeedIdentity() default true;
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/core/framework/PersonIdentifyAspect.java
View file @ d2e9703d
......@@ -40,7 +40,7 @@ public class PersonIdentifyAspect {
String identityType = "1";
String personSeq = "1421016571081420802";
String personName = "SHG";
String companyId = "10";
String companyId = "1420727427956502529";
reginParam.setPersonIdentity(new ReginParams.PersonIdentity(identityType, personSeq, personName, companyId));
redisUtils.set(buildKey(RequestContext.getToken()), JSONObject.toJSONString(reginParam));
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment