粮情异常接口

src/main/java/com/unissoft/feign/SystemFeign.java

@@ -27,4 +27,7 @@ public interface SystemFeign {
     @GetMapping("/basicsDepot/authority/getAllLONAndLAT")
     ResultView getAllLONAndLAT(@RequestParam("homeType") Integer homeType, @RequestParam("depotId") Integer depotId);
 
+    @GetMapping("/basicsDepot/authority/getItselfJoinDownDepotId/{depotId}")
+    ResultView getItselfJoinDownDepotId(@PathVariable("depotId") Integer depotId);
+
 }

src/main/java/com/unissoft/feign/SystemHystrix.java

@@ -38,4 +38,10 @@ public class SystemHystrix implements SystemFeign {
 		return ResultView.hystrixError("getAllLONAndLAT方法");
 	}
 
+	@Override
+	public ResultView getItselfJoinDownDepotId(Integer depotId) {
+		logger.error("调用csc-szls-system-manage(getItselfJoinDownDepotId方法)服务根据id查询用户信息失败!");
+		return ResultView.hystrixError("getItselfJoinDownDepotId方法");
+	}
+
 }

src/main/java/com/unissoft/grainManage/controller/GrainConditionRecordController.java

@@ -6,6 +6,8 @@ import com.unissoft.constant.GrainConstant;
 import com.unissoft.grainManage.service.GrainConditionRecordService;
 import com.unissoft.model.GrainAdd;
 import com.unissoft.model.GrainConditionRecord;
+import com.unissoft.model.GrainError;
+import com.unissoft.model.GrainErrorEChars;
 import com.unissoft.result.PageParam;
 import com.unissoft.result.ResultView;
 import io.swagger.annotations.Api;
@@ -17,6 +19,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.validation.constraints.NotNull;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -77,4 +80,18 @@ public class GrainConditionRecordController {
         return ResultView.error();
     }
 
+    @ApiOperation(value = "首页粮情异常eChars", notes = "图表")
+    @GetMapping("/authority/getGrainErrorEChars/{depotId}")
+    public ResultView getGrainErrorEChars(@PathVariable("depotId") Integer depotId) {
+        List<GrainErrorEChars> errorList = grainConditionRecordService.getGrainErrorEChars(depotId);
+        return ResultView.success(errorList);
+    }
+
+    @ApiOperation(value = "粮情异常列表分页查询", notes = "提交参数: depotId 非空")
+    @GetMapping("/authority/getGrainErrorCount")
+    public ResultView getGrainErrorCount(@Validated PageParam pageParam) {
+        IPage<GrainError> page = grainConditionRecordService.getGrainErrorCount(pageParam);
+        return ResultView.success(page);
+    }
+
 }

src/main/java/com/unissoft/grainManage/service/GrainConditionRecordService.java

@@ -4,9 +4,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.unissoft.model.GrainAdd;
 import com.unissoft.model.GrainConditionRecord;
+import com.unissoft.model.GrainError;
+import com.unissoft.model.GrainErrorEChars;
 import com.unissoft.result.PageParam;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -27,4 +30,8 @@ public interface GrainConditionRecordService extends IService<GrainConditionReco
     boolean deleteById(Integer id);
 
     boolean updateGrainRecord(GrainAdd model);
+
+    IPage<GrainError> getGrainErrorCount(PageParam pageParam);
+
+    List<GrainErrorEChars> getGrainErrorEChars(Integer depotId);
 }

src/main/java/com/unissoft/grainManage/service/impl/GrainConditionRecordServiceImpl.java

@@ -7,13 +7,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.unissoft.MyConstant;
 import com.unissoft.constant.GrainConstant;
+import com.unissoft.feign.SystemFeign;
 import com.unissoft.grainManage.service.GrainConditionRecordService;
 import com.unissoft.mapper.*;
 import com.unissoft.model.*;
 import com.unissoft.result.PageParam;
 import com.unissoft.utils.DateUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.ObjectUtils;
 import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -21,9 +21,8 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
+import javax.annotation.Resource;
 import java.util.*;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * <p>
@@ -46,6 +45,8 @@ public class GrainConditionRecordServiceImpl extends ServiceImpl<GrainConditionR
     private GrainAbnormalDescribeMapper grainAbnormalDescribeMapper;
     @Autowired
     private GrainConditionRecordChildMapper childMapper;
+    @Resource
+    private SystemFeign systemFeign;
 
     @Override
     public List<GrainConditionRecord> getByRoleTime(GrainConditionRecord requestRecord) {
@@ -184,4 +185,40 @@ public class GrainConditionRecordServiceImpl extends ServiceImpl<GrainConditionR
         return false;
     }
 
+    @Override
+    public List<GrainErrorEChars> getGrainErrorEChars(Integer depotId) {
+        // 调用基础服务查询当前登录人所在机构及下级机构编码
+        List<Integer> depotIds = (List) systemFeign.getItselfJoinDownDepotId(depotId).getData();
+        return grainConditionRecordMapper.getGrainErrorEChars(depotIds);
+    }
+
+    @Override
+    public IPage<GrainError> getGrainErrorCount(PageParam pageParam) {
+        // 分页
+        int pageIndex = pageParam.getPageIndex();
+        int pageSize = pageParam.getPageSize();
+        // 分页对象
+        IPage<GrainError> iPage = new Page<>();
+        // 查询条件
+        if (!StringUtils.isEmpty(pageParam.getCondition())) {
+            JSONObject object = new JSONObject(pageParam.getCondition());
+            Integer depotId = object.getInt("depotId"); // 库id
+            // 调用基础服务查询当前登录人所在机构及下级机构编码
+            List<Integer> depotIds = (List) systemFeign.getItselfJoinDownDepotId(depotId).getData();
+            log.info("depotIds -> {}", JSON.toJSONString(depotIds));
+            if (pageIndex != MyConstant.ZERO && pageSize != MyConstant.ZERO) {
+                iPage.setCurrent(pageIndex);
+                iPage.setSize(pageSize);
+            }
+            // 查询map对象
+            Map<String, Object> map = JSON.parseObject(pageParam.getCondition(), Map.class);
+            map.put("depotIds", depotIds);
+            // 获取分页查询数据
+            IPage<GrainError> res = grainConditionRecordMapper.getGrainErrorCount(iPage, map);
+            log.info("IPage res-> {}", JSON.toJSONString(res));
+            return res;
+        }
+        return iPage;
+    }
+
 }

src/main/java/com/unissoft/mapper/GrainConditionRecordMapper.java

@@ -3,6 +3,8 @@ package com.unissoft.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.unissoft.model.GrainConditionRecord;
+import com.unissoft.model.GrainError;
+import com.unissoft.model.GrainErrorEChars;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -22,6 +24,10 @@ public interface GrainConditionRecordMapper extends BaseMapper<GrainConditionRec
 
     List<GrainConditionRecord> getByCheckPersonAndCheckTime(@Param("houseId") Integer houseId, @Param("depotId") Integer depotId);
 
+    IPage<GrainError> getGrainErrorCount(IPage<GrainError> iPage, @Param("params") Map<String, Object> map);
+
+    List<GrainErrorEChars> getGrainErrorEChars(@Param("depotIds") List<Integer> depotIds);
+
     // List<GrainConditionRecord> getByPersonAndTime();
 //    int getSelectRecordId();
 

src/main/java/com/unissoft/mapper/GrainConditionRecordMapper.xml

@@ -56,6 +56,54 @@
         AND gr.house_id = el.house_id
         AND gr.depot_id = el.depot_id
     </select>
+    <select id="getGrainErrorEChars" parameterType="java.util.List" resultType="com.unissoft.model.GrainErrorEChars">
+        SELECT
+            COUNT(grc.id) errorCount,
+            gr.depot_id depotId,
+            gr.check_year checkYear,
+            gr.check_year_week checkYearWeek
+        FROM
+            grain_condition_record gr
+        INNER JOIN grain_condition_record_child grc ON gr.id = grc.parent_id
+        AND gr.enum_id = 19
+        AND grc.enum_id = 191
+        AND gr.anomalous_status = 1
+        AND grc.anomalous_status = 1
+        AND gr.check_year = YEAR (NOW())
+        AND gr.depot_id IN
+        <foreach item="item" collection="depotIds" separator="," open="(" close=")">#{item}</foreach>
+        GROUP BY
+            gr.check_year_week
+    </select>
+    <select id="getGrainErrorCount" resultType="com.unissoft.model.GrainError">
+        SELECT
+            gr.id pId,
+            grc.id cId,
+            gr.depot_id depotId,
+            gr.check_year checkYear,
+            gr.check_year_week checkYearWeek,
+            gr.house_id houseId,
+            grc.anomalous_status anomalousStatus,
+            grc.enum_id enumId,
+            grc.operation_time operationTime
+        FROM
+            grain_condition_record gr
+        INNER JOIN grain_condition_record_child grc ON gr.id = grc.parent_id
+        AND grc.enum_id = 191
+        AND gr.enum_id = 19
+        AND grc.anomalous_status = 1
+        AND gr.anomalous_status = 1
+        <if test="params.checkYear != null">
+            AND gr.check_year = #{params.checkYear}
+        </if>
+        <if test="params.checkYearWeek != null">
+            AND gr.check_year_week = #{params.checkYearWeek}
+        </if>
+        AND gr.depot_id IN
+        <foreach item="depotId" collection="params.depotIds" separator="," open="(" close=")">#{depotId}</foreach>
+        ORDER BY
+            gr.check_year_week
+    </select>
 
   <!--  <select id="getByPersonAndTime"  resultType="com.unissoft.model.GrainConditionRecord">
         SELECT

src/main/java/com/unissoft/model/GrainConditionRecord.java

@@ -56,11 +56,11 @@ public class GrainConditionRecord implements Serializable {
     @TableField("check_person")
     private Integer checkPerson;
 
-    @ApiModelProperty(value = "库id")
+    @ApiModelProperty(value = "仓房id")
     @TableField("house_id")
     private Integer houseId;
 
-    @ApiModelProperty(value = "仓房id")
+    @ApiModelProperty(value = "库id")
     @TableField("depot_id")
     private Integer depotId;
 

src/main/java/com/unissoft/model/GrainError.java

@@ -0,0 +1,56 @@
+package com.unissoft.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author qingsong.han
+ * @description: 粮情异常数据对象
+ * @create 2021-02-26 9:43
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "粮情异常类", description = "粮情检测记录")
+public class GrainError implements Serializable {
+    private static final long serialVersionUID = 2162086215502754428L;
+
+    @ApiModelProperty(value = "粮情检测记录id")
+    private Integer pId;
+
+    @ApiModelProperty(value = "粮情检测记录子表id")
+    private Integer cId;
+
+    @ApiModelProperty(value = "库id")
+    private Integer depotId;
+
+    @ApiModelProperty(value = "检查年份(用于粮情异常等,做年统计)")
+    private Integer checkYear;
+
+    @ApiModelProperty(value = "检查所在年第几周")
+    private Integer checkYearWeek;
+
+    @ApiModelProperty(value = "仓房id")
+    private Integer houseId;
+
+    @ApiModelProperty(value = "是否异常_选项(0:否,1:是)")
+    private Integer anomalousStatus;
+
+    @ApiModelProperty(value = "检查类型(子表检查项)")
+    private Integer enumId;
+
+    @ApiModelProperty(value = "检查(操作)时间(子表)")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date operationTime;
+
+}

src/main/java/com/unissoft/model/GrainErrorEChars.java

@@ -0,0 +1,31 @@
+package com.unissoft.model;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * @author qingsong.han
+ * @description: 粮情异常首页eChars返回基类
+ * @create 2021-02-26 15:58
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class GrainErrorEChars implements Serializable {
+    private static final long serialVersionUID = -8644715628790677956L;
+
+    @ApiModelProperty(value = "粮情异常数量")
+    private Integer errorCount;
+
+    @ApiModelProperty(value = "库id")
+    private Integer depotId;
+
+    @ApiModelProperty(value = "检查年份(用于粮情异常等,做年统计)")
+    private Integer checkYear;
+
+    @ApiModelProperty(value = "检查所在年第几周")
+    private Integer checkYearWeek;
+
+}