修改首页出入库统计，修改redis推送消息bug

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/FetchingDataDto/DeviceConfigInfoDto.java

 package com.junmp.jyzb.api.bean.dto.FetchingDataDto;
 
-import java.util.List;
+import lombok.Data;
 
+import java.util.List;
+//同步配置返回实体类
+@Data
 public class DeviceConfigInfoDto {
     private String deviceConfig;
 }

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/FetchingDataDto/EquipmentDto.java

@@ -4,7 +4,7 @@ import lombok.Data;
 
 import java.math.BigDecimal;
 import java.util.Date;
-
+//同步库存返回实体类
 @Data
 public class EquipmentDto {
     private String id;

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/FetchingDataDto/PoliceDto.java

@@ -5,7 +5,7 @@ import lombok.Data;
 
 import java.util.Date;
 import java.util.List;
-
+//同步警员返回实体类
 @Data
 public class PoliceDto {
     private String id;

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/FetchingDataDto/SizeDto.java

@@ -4,7 +4,7 @@ import lombok.Data;
 
 import java.math.BigDecimal;
 import java.util.Date;
-
+//同步号型返回实体类
 @Data
 public class SizeDto {
     /**

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/FetchingDataDto/SupplierInfoDto.java

@@ -3,7 +3,7 @@ package com.junmp.jyzb.api.bean.dto.FetchingDataDto;
 import lombok.Data;
 
 import java.util.Date;
-
+//同步供应商返回实体类
 @Data
 public class SupplierInfoDto {
     /**

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/FetchingDataDto/TypeDto.java

@@ -4,7 +4,7 @@ import lombok.Data;
 
 import java.util.Date;
 import java.util.List;
-
+//同步类型返回实体类
 @Data
 public class TypeDto {
     private String id;

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/FetchingDataDto/UserDto.java

 package com.junmp.jyzb.api.bean.dto.FetchingDataDto;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 
 import java.util.Date;
-
+//同步账号返回实体类
 @Data
 public class UserDto {
 

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/FetchingDataDto/WarehouseDevInfoDto.java

@@ -3,7 +3,7 @@ package com.junmp.jyzb.api.bean.dto.FetchingDataDto;
 import lombok.Data;
 
 import java.util.Date;
-
+//同步除湿机返回实体类
 @Data
 public class WarehouseDevInfoDto {
     private String id;

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/FetchingDataDto/WarehouseInfoDto.java

 package com.junmp.jyzb.api.bean.dto.FetchingDataDto;
 
 import lombok.Data;
-
+//同步仓库返回实体类
 @Data
 public class WarehouseInfoDto {
     private String id;

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/TjDto/TjOutAndInDto.java

+package com.junmp.jyzb.api.bean.dto.TjDto;
+
+import lombok.Data;
+
+//首页出入库返回实体类
+@Data
+public class TjOutAndInDto {
+
+    private Integer year;
+    private Integer month;
+    private Integer inNumber;
+    private Integer outNumber;
+
+}

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/PolicemanReq.java

@@ -68,7 +68,7 @@ public class PolicemanReq extends BaseRequest {
     private String order;
     private String column;
 
-    private List<String> roleList;
+    private List<String> roleCodeList;
 
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/TjReq/TjOrgCountReq.java

@@ -10,12 +10,11 @@ import java.util.List;
 @Data
 public class TjOrgCountReq extends BaseRequest {
     //组织机构
-    @NotNull(message = "组织机构不能为空",groups = detail.class)
+    @NotNull(message = "组织机构不能为空",groups = {detail.class,list.class})
     private Long orgId;
     private List<String> typeIdsList;
     private List<String> sizeNameList;
     @NotNull(message = "年份不能为空",groups = detail.class)
     private Integer year;
-
     private List<Integer> monthList;
 }
\ No newline at end of file

jyzb-biz/src/main/java/com/junmp/jyzb/controller/TjController.java

@@ -4,15 +4,16 @@ import com.junmp.jyzb.api.bean.dto.InventorySumDto;
 import com.junmp.jyzb.api.bean.dto.TjDto.*;
 import com.junmp.jyzb.api.bean.query.TjReq.TjOrgCountReq;
 import com.junmp.jyzb.api.bean.query.TjReq.TjOrgEqsReq;
-import com.junmp.jyzb.api.bean.query.TjReq.TjOrgPoliceReq;
 import com.junmp.jyzb.api.bean.query.TjReq.TjOrgPriceReq;
+import com.junmp.jyzb.api.bean.query.WarehouseReq;
+import com.junmp.jyzb.entity.Temp.HumidityAndtemperature;
 import com.junmp.jyzb.service.TjService;
+import com.junmp.jyzb.service.WarehouseService;
 import com.junmp.v2.common.bean.request.ValidationApi;
 import com.junmp.v2.common.bean.response.ApiRes;
 import com.junmp.v2.db.api.page.PageResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import liquibase.pro.packaged.B;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -32,6 +33,9 @@ public class TjController {
    @Resource
    private TjService tjService;
 
+    @Resource
+    public WarehouseService warehouseService;
+
     /**
      * ------------------------------------装备统计报表--------------------------------------------
      */
@@ -130,6 +134,13 @@ public class TjController {
         return ApiRes.success(tjService.TjOrgCountByType(req));
     }
 
+    //首页出入库统计
+    @PostMapping("/TjOutAndInCount")
+    @ApiOperation("首页出入库统计")
+    public ApiRes<List<TjOutAndInDto>> TjOutAndInCount(@RequestBody @Validated(ValidationApi.list.class) TjOrgCountReq req){
+        return ApiRes.success(tjService.TjOutAndInCount(req));
+    }
+
     /**
      * --------------------------------------人员统计报表-------------------------------------------
      */
@@ -162,6 +173,14 @@ public class TjController {
      * --------------------------------------温湿度记录-------------------------------------------
      */
 
+    @PostMapping("showHumidityAndtemperature")
+    @ApiOperation("展示温湿度记录")
+    public ApiRes<List<HumidityAndtemperature>> showHumidityAndtemperature(@RequestBody WarehouseReq req){
+        return ApiRes.success(warehouseService.showHumidityAndtemperature(req));
+    }
+
+
+
 
 
     @PostMapping("/test")

jyzb-biz/src/main/java/com/junmp/jyzb/controller/WarehouseController.java

@@ -147,10 +147,6 @@ public class WarehouseController {
         return ApiRes.success(warehouseService.updateHumidityAndtemperature(req));
     }
 
-    @PostMapping("showHumidityAndtemperature")
-    @ApiOperation("展示温湿度记录")
-    public ApiRes<List<HumidityAndtemperature>> showHumidityAndtemperature(@RequestBody WarehouseReq req){
-        return ApiRes.success(warehouseService.showHumidityAndtemperature(req));
-    }
+
 
 }

jyzb-biz/src/main/java/com/junmp/jyzb/mapper/LogSummaryMapper.java

@@ -2,11 +2,15 @@ package com.junmp.jyzb.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.junmp.jyzb.api.bean.dto.TjDto.TjOutAndInDto;
 import com.junmp.jyzb.api.bean.query.LogSummaryReq;
+import com.junmp.jyzb.api.bean.query.TjReq.TjOrgCountReq;
 import com.junmp.jyzb.entity.LogSummary;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
 * @author lxh专属坐骑
 * @description 针对表【base_log_summary】的数据库操作Mapper
@@ -15,6 +19,7 @@ import org.apache.ibatis.annotations.Param;
 */
 public interface LogSummaryMapper extends BaseMapper<LogSummary> {
 
+    List<TjOutAndInDto> TjOutAndInCount(@Param("req") TjOrgCountReq req);
 }
 
 

jyzb-biz/src/main/java/com/junmp/jyzb/mapper/PolicemanMapper.java

@@ -53,13 +53,13 @@ public interface PolicemanMapper extends BaseMapper<Policeman> {
                                              @Param("phone")String phone,@Param("flag") String flag,
                                              @Param("pageNo")Long pageNo, @Param("pageSize") Long pageSize,
                                              @Param("column") String column,@Param("order") String order,
-                                             @Param("roleList") List<String> roleList);
+                                             @Param("roleCodeList") List<String> roleCodeList);
 
     long count(@Param("orgId") Long orgId, @Param("account")String account,
                @Param("name") String name, @Param("policeCode")String policeCode,
                @Param("state")Integer state,
                @Param("phone")String phone,@Param("flag") String flag,
-               @Param("roleList") List<String> roleList);
+               @Param("roleCodeList") List<String> roleCodeList);
 
     List<UserDto> alignUserInfo(@Param("orgId") Long orgId, @Param("date")String date);
 }
\ No newline at end of file

jyzb-biz/src/main/java/com/junmp/jyzb/service/TjService.java

@@ -44,4 +44,6 @@ public interface TjService {
     boolean updateTjOrgCount(TjOrgCountReq req);
 
     List<TjOrgCountDto> TjOrgCountByType(TjOrgCountReq req);
+
+    List<TjOutAndInDto> TjOutAndInCount(TjOrgCountReq req);
 }

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/OrderMainServiceImpl.java

 package com.junmp.jyzb.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -48,6 +51,7 @@ import org.springframework.amqp.core.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
@@ -298,12 +302,15 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
         String objJson= redisCache.get(order.getProcessId());
         redisCache.remove(order.getProcessId());
         List<MessageSendReq> msgs= JSONObject.parseArray(objJson,MessageSendReq.class);
-        msgs.forEach(msg->
-                {
-                    messageApi.sendMessage(msg);
-                }
+        if (CollectionUtil.isNotEmpty(msgs)){
+            msgs.forEach(msg->
+                    {
+                        messageApi.sendMessage(msg);
+                    }
+
+            );
+        }
 
-        );
         return list;
     }
 
@@ -359,6 +366,10 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
                     break;
             }
         }
+        Object A= JSON.toJSONString(req, SerializerFeature.WriteDateUseDateFormat);
+        JSONObject jsonObject = JSON.parseObject(A.toString());
+
+        startProcessInstanceDTO.setFormData(jsonObject);
         return startProcessInstanceDTO;
     }
 

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PolicemanServiceImpl.java

@@ -5,6 +5,8 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -503,7 +505,7 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
         List<PolicemanDto> policemanDtos = policemanMapper.selectUserBypoliceIds
                 (req.getOrgId(),req.getAccount(),req.getName(),req.getPoliceCode(),
                         req.getState(),req.getPhone(),req.getFlag(),(req.getPageNo()-1)*req.getPageSize()
-                        ,req.getPageSize(),req.getColumn(),req.getOrder(),req.getRoleList());
+                        ,req.getPageSize(),req.getColumn(),req.getOrder(),req.getRoleCodeList());
         return policemanDtos;
     }
 
@@ -529,11 +531,11 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
             req.setPageNo(1L);
             req.setPageSize(10L);
         }
-        long size=policemanMapper.count(req.getOrgId(),req.getAccount(),req.getName(),req.getPoliceCode(),req.getState(),req.getPhone(),req.getFlag(),req.getRoleList());
+        long size=policemanMapper.count(req.getOrgId(),req.getAccount(),req.getName(),req.getPoliceCode(),req.getState(),req.getPhone(),req.getFlag(),req.getRoleCodeList());
         List<PolicemanDto> policemanDtos = policemanMapper.selectUserBypoliceIds
                 (req.getOrgId(),req.getAccount(),req.getName(),req.getPoliceCode(),
                         req.getState(),req.getPhone(),req.getFlag(),(req.getPageNo()-1)*req.getPageSize()
-                        ,req.getPageSize(),req.getColumn(),req.getOrder(),req.getRoleList());
+                        ,req.getPageSize(),req.getColumn(),req.getOrder(),req.getRoleCodeList());
        //判断是否需要添加空数据
         if(req.getIsCreateNullDate()==null || req.getIsCreateNullDate()){
             Class<PolicemanDto> policemanDto = PolicemanDto.class;
@@ -1118,6 +1120,9 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
             startProcessInstanceDTO.setUserId(req.getUserId());
             startProcessInstanceDTO.setType("reassignmentDto");
             startProcessInstanceDTO.setReassignmentType(req.getReassignmentType());
+            Object A= JSON.toJSONString(req, SerializerFeature.WriteDateUseDateFormat);
+            JSONObject jsonObject = JSON.parseObject(A.toString());
+            startProcessInstanceDTO.setFormData(jsonObject);
             String ProcessInstanceId= FlowInstanceService.startProcessInstanceById(startProcessInstanceDTO);
             reassignment.setProcessId(ProcessInstanceId);
             String assigns= FlowInstanceService.GetNextAssign(ProcessInstanceId);//这里需要手动更新审核人信息

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/TjServiceImpl.java

@@ -25,24 +25,19 @@ import java.util.stream.Collectors;
 
 @Service
 public class TjServiceImpl implements TjService {
-    @Resource
-    private PubOrgMapper pubOrgMapper;
-
-    @Resource
-    private PubOrgService pubOrgService;
 
     @Resource
     private InventorySummaryMapper inventorySummaryMapper;
 
     @Resource
-    private EquipmentSizeService equipmentSizeService;
-
-    @Resource
     private PriceSumSummaryMapper priceSumSummaryMapper;
 
     @Resource
     private EquipmentCountSummaryMapper equipmentCountSummaryMapper;
 
+    @Resource
+    private LogSummaryMapper logSummaryMapper;
+
 
     //装备统计报表
     @Override
@@ -412,4 +407,11 @@ public class TjServiceImpl implements TjService {
     public List<TjOrgCountDto> TjOrgCountByType(TjOrgCountReq req) {
         return equipmentCountSummaryMapper.TjOrgCountByType(req);
     }
+
+    //首页出入库统计
+    @Override
+    public List<TjOutAndInDto> TjOutAndInCount(TjOrgCountReq req) {
+        List<TjOutAndInDto> returnList=logSummaryMapper.TjOutAndInCount(req);
+        return returnList;
+    }
 }

jyzb-biz/src/main/resources/mapper/LogSummaryMapper.xml

@@ -32,6 +32,31 @@
         picture,equipment_List,create_time,
         update_time,update_user,create_user
     </sql>
+    <select id="TjOutAndInCount" resultType="com.junmp.jyzb.api.bean.dto.TjDto.TjOutAndInDto">
+        WITH RECURSIVE months AS (
+        SELECT 1 AS month
+        UNION ALL
+        SELECT month + 1 FROM months WHERE month &lt; 12
+        ),
+        years AS (
+        SELECT DISTINCT EXTRACT(YEAR FROM create_time) AS year
+        FROM base_log_summary
+        WHERE org_id = #{req.orgId} AND location_type = 0 AND EXTRACT(YEAR FROM create_time) = YEAR(NOW())
+        )
+        SELECT
+        months.month AS month,
+        years.year AS year,
+        COALESCE(SUM(CASE WHEN b.out_in_state = 'in' THEN b.number ELSE 0 END), 0) AS in_number,
+        COALESCE(SUM(CASE WHEN b.out_in_state = 'out' THEN b.number ELSE 0 END), 0) AS out_number
+        FROM
+        years
+        CROSS JOIN months
+        LEFT JOIN base_log_summary b ON EXTRACT(MONTH FROM b.create_time) = months.month
+        AND EXTRACT(YEAR FROM b.create_time) = years.year
+        AND b.org_id = #{req.orgId} AND b.location_type = 0
+        GROUP BY months.month, years.year
+        ORDER BY year, month;
+    </select>
 
 
 </mapper>

jyzb-biz/src/main/resources/mapper/PolicemanMapper.xml

@@ -252,7 +252,8 @@ WHERE o.org_id IN
         select b.* FROM(
             select a.*, GROUP_CONCAT(sr.role_name SEPARATOR ',') AS role_name FROM (
                 select
-                su.user_id,su.account,su.status_flag as state,suo.org_id,max(p.id) as id,max(p.name) as name,
+                su.user_id,su.account,su.status_flag as state,suo.org_id,max(p.id) as id,
+                COALESCE(max(p.name),max(su.nick_name)) as name,
                 max(p.police_code) as police_code,max(p.face_info) as face_info,max(p.password) as password,
                 max(p.photo) as photo,max(p.phone) as phone,max(p.id_card) as id_card,max(p.identity) as identity,
                 max(p.hk_face_device) as hk_face_device,max(su.create_time) as create_time,su.nick_name
@@ -263,10 +264,10 @@ WHERE o.org_id IN
             ) as a
             JOIN sys_user_role sur on a.user_id=sur.user_id
             join sys_role sr on sr.role_id=sur.role_id
-            <if test="roleList != null and roleList.size()>0">
+            <if test="roleCodeList != null and roleCodeList.size()>0">
                 and
-                <foreach collection="roleList" item="item" open="(" separator="or" close=")">
-                    sr.role_id=#{item}
+                <foreach collection="roleCodeList" item="item" open="(" separator="or" close=")">
+                    sr.role_code=#{item}
                 </foreach>
             </if>
             where 1=1
@@ -302,7 +303,8 @@ WHERE o.org_id IN
             select b.* FROM(
                 select a.*, GROUP_CONCAT(sr.role_name SEPARATOR ',') AS role_name FROM (
                     select
-                    su.user_id,su.account,su.status_flag as state,suo.org_id,max(p.id) as id,max(p.name) as name,
+                    su.user_id,su.account,su.status_flag as state,suo.org_id,max(p.id) as id,
+                    COALESCE(max(p.name),max(su.nick_name)) as name,
                     max(p.police_code) as police_code,max(p.face_info) as face_info,max(p.password) as password,
                     max(p.photo) as photo,max(p.phone) as phone,max(p.id_card) as id_card,max(p.identity) as identity,
                     max(p.hk_face_device) as hk_face_device,max(su.create_time) as create_time,su.nick_name
@@ -313,10 +315,10 @@ WHERE o.org_id IN
                 ) as a
                 JOIN sys_user_role sur on a.user_id=sur.user_id
                 join sys_role sr on sr.role_id=sur.role_id
-                <if test="roleList != null and roleList.size()>0">
+                <if test="roleCodeList != null and roleCodeList.size()>0">
                     and
-                    <foreach collection="roleList" item="item" open="(" separator="or" close=")">
-                        sr.role_id=#{item}
+                    <foreach collection="roleCodeList" item="item" open="(" separator="or" close=")">
+                        sr.role_code=#{item}
                     </foreach>
                 </if>
                 where 1=1