java110-bean/src/main/java/com/java110/dto/inspectionTask/InspectionTaskDto.java
@@ -18,6 +18,7 @@ private String planUserId; private String actInsTime; private String planInsTime; private String todayPlanInsTime; // 今天计划时间 private String actUserName; private String signType; private String signTypeName; @@ -190,4 +191,12 @@ public void setStates(String[] states) { this.states = states; } public String getTodayPlanInsTime() { return todayPlanInsTime; } public void setTodayPlanInsTime(String todayPlanInsTime) { this.todayPlanInsTime = todayPlanInsTime; } } java110-db/src/main/resources/mapper/community/InspectionTaskServiceDaoImplMapper.xml
@@ -141,6 +141,9 @@ <if test="planInsTime !=null "> and t.plan_ins_time= #{planInsTime} </if> <if test="todayPlanInsTime !=null "> and t.plan_ins_time > #{todayPlanInsTime} </if> <if test="statusCd !=null and statusCd != ''"> and t.status_cd= #{statusCd} </if> service-community/src/main/java/com/java110/community/api/BigScreenApi.java
@@ -1,9 +1,6 @@ package com.java110.community.api; import com.java110.community.bmo.assets.IQueryAssetsBMO; import com.java110.community.bmo.assets.IQueryAssetsFeeBMO; import com.java110.community.bmo.assets.IQueryAssetsRepairBMO; import com.java110.community.bmo.assets.IQueryAssetsRoomBMO; import com.java110.community.bmo.assets.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.RequestMapping; @@ -27,6 +24,9 @@ @Autowired private IQueryAssetsFeeBMO queryAssetsFeeBMOImpl; @Autowired private IQueryAssetsInspectionBMO queryAssetsInspectionBMOImpl; /** @@ -79,4 +79,17 @@ public ResponseEntity<String> getAssetsFee(@RequestParam(value = "communityId") String communityId) { return queryAssetsFeeBMOImpl.query(communityId); } /** * 今日巡检 * * @param communityId * @return * @Service /bigScreen/getAssetInspection * @path /app/bigScreen/getAssetInspection */ @RequestMapping(value = "/getAssetInspection", method = RequestMethod.GET) public ResponseEntity<String> getAssetInspection(@RequestParam(value = "communityId") String communityId) { return queryAssetsInspectionBMOImpl.query(communityId); } } service-community/src/main/java/com/java110/community/bmo/assets/IQueryAssetsInspectionBMO.java
New file @@ -0,0 +1,16 @@ package com.java110.community.bmo.assets; import org.springframework.http.ResponseEntity; /** * 资产查询接口类 */ public interface IQueryAssetsInspectionBMO { /** * 查询资产信息 * @param communityId * @return */ ResponseEntity<String> query(String communityId); } service-community/src/main/java/com/java110/community/bmo/assets/impl/QueryAssetsInspectionBMOImpl.java
New file @@ -0,0 +1,82 @@ package com.java110.community.bmo.assets.impl; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.java110.community.bmo.assets.IQueryAssetsInspectionBMO; import com.java110.dto.inspectionTask.InspectionTaskDto; import com.java110.intf.community.IInspectionTaskInnerServiceSMO; import com.java110.utils.util.DateUtil; import com.java110.vo.ResultVo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; import java.util.Calendar; import java.util.Date; import java.util.List; @Service public class QueryAssetsInspectionBMOImpl implements IQueryAssetsInspectionBMO { protected final static Logger logger = LoggerFactory.getLogger(QueryAssetsInspectionBMOImpl.class); @Autowired private IInspectionTaskInnerServiceSMO inspectionTaskInnerServiceSMOImpl; /** * @param communityId * @return { * data:{ * floorCount:30, * roomCount:29, * parkingSpaceCount:12, * machineCount:12 * } * } */ @Override public ResponseEntity<String> query(String communityId) { InspectionTaskDto inspectionTaskDto = new InspectionTaskDto(); inspectionTaskDto.setCommunityId(communityId); Calendar calendar = Calendar.getInstance(); calendar.add(Calendar.DATE, -1); inspectionTaskDto.setTodayPlanInsTime(DateUtil.getFormatTimeString(calendar.getTime(), DateUtil.DATE_FORMATE_STRING_A)); List<InspectionTaskDto> inspectionTaskDtos = inspectionTaskInnerServiceSMOImpl.queryInspectionTasks(inspectionTaskDto); JSONArray data = new JSONArray(); for (InspectionTaskDto inspectionTaskDto1 : inspectionTaskDtos) { dealInpectionTask(data, inspectionTaskDto1); } return ResultVo.createResponseEntity(data); } private void dealInpectionTask(JSONArray data, InspectionTaskDto inspectionTaskDto1) { JSONObject dataObj = null; dataObj = new JSONObject(); String state = inspectionTaskDto1.getState(); try { Date planInTime = DateUtil.getDateFromString(inspectionTaskDto1.getPlanInsTime(), DateUtil.DATE_FORMATE_STRING_A); if ("20200407".equals(state)) { dataObj.put("msg", inspectionTaskDto1.getPlanUserName() + " 于 " + inspectionTaskDto1.getActInsTime() + " 巡检完成"); } else if ("20200406".equals(state)) { dataObj.put("msg", inspectionTaskDto1.getPlanUserName() + " 正在巡检中"); } else { if (planInTime.getTime() > DateUtil.getCurrentDate().getTime()) { dataObj.put("msg", inspectionTaskDto1.getPlanUserName() + " 未巡检"); } else { dataObj.put("msg", inspectionTaskDto1.getPlanUserName() + " 将于 " + inspectionTaskDto1.getPlanInsTime() + " 开始巡检"); } } data.add(dataObj); } catch (Exception e) { logger.error("数据异常", e); } } } service-community/src/main/resources/application-dev.yml
@@ -45,26 +45,13 @@ max-idle: 100 min-idle: 0 timeout: 0 # datasource: # connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 # minIdle: 5 # validationQuery: SELECT 1 FROM DUAL # initialSize: 5 # maxWait: 60000 # filters: stat,wall,log4j # poolPreparedStatements: true # type: com.alibaba.druid.pool.DruidDataSource # url: jdbc:mysql://dev.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8 # maxPoolPreparedStatementPerConnectionSize: 20 # password: TT@12345678 # testOnBorrow: false # testWhileIdle: true # minEvictableIdleTimeMillis: 300000 # timeBetweenEvictionRunsMillis: 60000 # testOnReturn: false # driverClassName: com.mysql.jdbc.Driver # maxActive: 20 # username: TT feign: client: config: default: connect-timeout: 10000 read-timeout: 20000 #============== kafka =================== kafka: service-fee/src/main/java/com/java110/fee/smo/impl/FeeInnerServiceSMOImpl.java
@@ -238,7 +238,7 @@ } @Override public JSONArray getAssetsFee(String communityId) { public JSONArray getAssetsFee(@RequestBody String communityId) { JSONArray data = new JSONArray(); FeeConfigDto feeConfigDto = new FeeConfigDto();
