Merge remote-tracking branch 'origin/master'

boman-web-core/src/main/java/com/boman/web/core/mapper/CzrkJzdzMapper.java

@@ -67,4 +67,6 @@ import java.util.List;
     List<Long> listCzrkIdByTypeAreaIdUserName(@Param("type") int type, @Param("areaId") Long areaId, @Param("userName") String userName);
 
     int updateByIdCard(CzrkJzdz czrkJzdz);
+
+    int updateByCzrkId(CzrkJzdz czrkJzdz);
 }

boman-web-core/src/main/java/com/boman/web/core/service/czrk/CzrkJzdzServiceImpl.java

@@ -111,4 +111,12 @@ public class CzrkJzdzServiceImpl implements ICzrkJzdzService {
     public int updateByIdCard(CzrkJzdz czrkJzdz) {
         return czrkJzdzMapper.updateByIdCard(czrkJzdz);
     }
+
+
+    @Override
+    public int updateByCzrkId(CzrkJzdz czrkJzdz) {
+        return czrkJzdzMapper.updateByCzrkId(czrkJzdz);
+    }
+
+
 }

boman-web-core/src/main/java/com/boman/web/core/service/czrk/CzrkServiceImpl.java

@@ -53,7 +53,7 @@ import static com.google.common.base.Strings.nullToEmpty;
 @Slf4j
 public class CzrkServiceImpl implements ICzrkService {
 
-    private static JSONObject QIANSHANSHI = null, ZHEN = null, QIANSHANSHI_SINGEL = null;
+    private static JSONObject QIANSHANSHI = null, ZHEN = null, QIANSHANSHI_SINGEL = null, ECHARTS_LINE = null;
 
     @Autowired
     private CzrkMapper czrkMapper;
@@ -96,6 +96,7 @@ public class CzrkServiceImpl implements ICzrkService {
 
         czrk.setStartTime(DateUtils.getTodayStartStr());
         czrk.setEndTime(DateUtils.getTodayEndStr());
+        startPage();
         List<Czrk> czrks = czrkMapper.listByXz(czrk);
         handleList1(czrks);
         return czrks;
@@ -107,6 +108,7 @@ public class CzrkServiceImpl implements ICzrkService {
 
         czrk.setStartTime(DateUtils.getTodayStartStr());
         czrk.setEndTime(DateUtils.getTodayEndStr());
+        startPage();
         List<Czrk> czrks = czrkMapper.listByJs(czrk);
         handleList1(czrks);
         return czrks;
@@ -291,7 +293,7 @@ public class CzrkServiceImpl implements ICzrkService {
         CzrkJzdz czrkJzdz = new CzrkJzdz();
         czrkJzdz.setCzrkId(czrkId);
         czrkJzdz.setStatus("N");
-        int update = czrkJzdzService.updateByIdCard(czrkJzdz);
+        int update = czrkJzdzService.updateByCzrkId(czrkJzdz);
         return 1;
     }
 
@@ -357,7 +359,8 @@ public class CzrkServiceImpl implements ICzrkService {
     @Override
     @Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
     public AjaxResult addRlry(Czrk czrk) {
-        String username = SecurityUtils.getUsername();
+        SysUser sysUser = AuthUtils.getLoginUser().getSysUser();
+        String username = sysUser.getUserName();
         if (isNotEmpty(czrk.getVillageTowns())) {
             czrk.setRlr(username);
             czrk.setIsRl("是");
@@ -767,101 +770,112 @@ public class CzrkServiceImpl implements ICzrkService {
 
     @Override
     public JSONObject hjczLine() {
+        JSONObject resultData = new JSONObject(5);
         // 统计范围 从今天往前推7天
         java.util.Date startTimeDate = DateUtils.getNowDate();
         java.util.Date endTimeDate = DateUtils.addDays(startTimeDate, -7);
         String endTime = DateUtils.dateTime1(startTimeDate);
         String startTime = DateUtils.dateTime1(endTimeDate);
         SysUser sysUser = AuthUtils.getLoginUser().getSysUser();
-        int type = 0;
-        Long areaId = null;
-
-        // 市领导 todo 此处不应该写死
-        List<String> roleKeySets = map(sysUser.getRoles(), SysRole::getRoleKey);
-        if (roleKeySets.contains("city") || roleKeySets.contains("admin") || roleKeySets.contains("yanshi")) {
-            type = 3;
-            areaId = 340882000000L;
-        } else if (roleKeySets.contains("sys:town")) {
-            type = 4;
-            areaId = sysUser.getDeptId();
-        }
 
         List<java.util.Date> dateList = DateUtils.getWeek(startTimeDate);
+        JSONObject jsonObject = redisService.getCacheObject("hjczLine");
+        if (isNotEmpty(jsonObject)) {
+            ECHARTS_LINE = jsonObject;
+            return jsonObject;
+        }
 
-        // 常住人口信息
-        List<Czrk> czxzs = czrkMapper.listByCzXz(startTime, endTime, type, areaId);
-        List<Czrk> czjss = czrkMapper.listByCzJs(startTime, endTime, type, areaId);
-
-        // 户籍人口信息
-        List<Czrk> hjxzs = czrkMapper.countByHjXz(startTime, endTime, type, areaId); // 新增
-        List<Czrk> hjjss = czrkMapper.countByHjJs(startTime, endTime, type, areaId);// 减少
+        ThreadPoolService.execute(()->{
+            int type = 0;
+            Long areaId = null;
+            // 市领导 todo 此处不应该写死
+            List<String> roleKeySets = map(sysUser.getRoles(), SysRole::getRoleKey);
+            if (roleKeySets.contains("city") || roleKeySets.contains("admin") || roleKeySets.contains("yanshi")) {
+                type = 3;
+                areaId = 340882000000L;
+            } else if (roleKeySets.contains("sys:town")) {
+                type = 4;
+                areaId = sysUser.getDeptId();
+            }
 
-        List<JSONObject> result = new ArrayList<>();
-        for (java.util.Date week : dateList) {
-            java.util.Date tomorrow = DateUtils.addDays(week, 1);
-            int czxz = 0, czjs = 0, hjxz = 0, hjjs = 0;
-            JSONObject temp = new JSONObject();
-            for (Czrk czrkxz : czxzs) {
-                Timestamp createTime = czrkxz.getCreateTime();
-                if (createTime.after(week) && createTime.before(tomorrow)) {
-                    czxz++;
+            // 常住人口信息
+            List<Czrk> czxzs = czrkMapper.listByCzXz(startTime, endTime, type, areaId);
+            List<Czrk> czjss = czrkMapper.listByCzJs(startTime, endTime, type, areaId);
+
+            // 户籍人口信息
+            List<Czrk> hjxzs = czrkMapper.countByHjXz(startTime, endTime, type, areaId); // 新增
+            List<Czrk> hjjss = czrkMapper.countByHjJs(startTime, endTime, type, areaId);// 减少
+
+            List<JSONObject> result = new ArrayList<>();
+            for (java.util.Date week : dateList) {
+                java.util.Date tomorrow = DateUtils.addDays(week, 1);
+                int czxz = 0, czjs = 0, hjxz = 0, hjjs = 0;
+                JSONObject temp = new JSONObject();
+                for (Czrk czrkxz : czxzs) {
+                    Timestamp createTime = czrkxz.getCreateTime();
+                    if (createTime.after(week) && createTime.before(tomorrow)) {
+                        czxz++;
+                    }
                 }
-            }
 
-            for (Czrk czrkjs : czjss) {
-                Timestamp updateTime = czrkjs.getUpdateTime();
-                if (updateTime != null) {
-                    if (updateTime.after(week) && updateTime.before(tomorrow)) {
-                        czjs++;
+                for (Czrk czrkjs : czjss) {
+                    Timestamp updateTime = czrkjs.getUpdateTime();
+                    if (updateTime != null) {
+                        if (updateTime.after(week) && updateTime.before(tomorrow)) {
+                            czjs++;
+                        }
                     }
                 }
-            }
 
-            for (Czrk hjrkxz : hjxzs) {
-                Timestamp createTime = hjrkxz.getCreateTime();
-                if (createTime.after(week) && createTime.before(tomorrow)) {
-                    czxz++;
+                for (Czrk hjrkxz : hjxzs) {
+                    Timestamp createTime = hjrkxz.getCreateTime();
+                    if (createTime.after(week) && createTime.before(tomorrow)) {
+                        czxz++;
+                    }
                 }
-            }
 
-            for (Czrk hjrkjs : hjjss) {
-                Timestamp updateTime = hjrkjs.getUpdateTime();
-                if (updateTime != null) {
-                    if (updateTime.after(week) && updateTime.before(tomorrow)) {
-                        czjs++;
+                for (Czrk hjrkjs : hjjss) {
+                    Timestamp updateTime = hjrkjs.getUpdateTime();
+                    if (updateTime != null) {
+                        if (updateTime.after(week) && updateTime.before(tomorrow)) {
+                            czjs++;
+                        }
                     }
                 }
+
+                temp.put("czxz", czxz);
+                temp.put("czjs", czjs);
+                temp.put("hjxz", hjxz);
+                temp.put("hjjs", hjjs);
+                temp.put("time", DateUtils.setHmsZero(week));
+                result.add(temp);
             }
 
-            temp.put("czxz", czxz);
-            temp.put("czjs", czjs);
-            temp.put("hjxz", hjxz);
-            temp.put("hjjs", hjjs);
-            temp.put("time", DateUtils.setHmsZero(week));
-            result.add(temp);
-        }
+            // 处理成图表格式
+            List<String> xData = new ArrayList<>(7);
+            List<Integer> czxz = new ArrayList<>(7);
+            List<Integer> czjs = new ArrayList<>(7);
+            List<Integer> hjxz = new ArrayList<>(7);
+            List<Integer> hjjs = new ArrayList<>(7);
+            for (JSONObject json : result) {
+                xData.add(json.getString("time"));
+                czxz.add(json.getInteger("czxz"));
+                czjs.add(json.getInteger("czjs"));
+                hjxz.add(json.getInteger("hjxz"));
+                hjjs.add(json.getInteger("hjjs"));
+            }
 
-        // 处理成图表格式
-        List<String> xData = new ArrayList<>(7);
-        List<Integer> czxz = new ArrayList<>(7);
-        List<Integer> czjs = new ArrayList<>(7);
-        List<Integer> hjxz = new ArrayList<>(7);
-        List<Integer> hjjs = new ArrayList<>(7);
-        for (JSONObject jsonObject : result) {
-            xData.add(jsonObject.getString("time"));
-            czxz.add(jsonObject.getInteger("czxz"));
-            czjs.add(jsonObject.getInteger("czjs"));
-            hjxz.add(jsonObject.getInteger("hjxz"));
-            hjjs.add(jsonObject.getInteger("hjjs"));
-        }
 
-        JSONObject resultData = new JSONObject(5);
-        resultData.put("time", xData);
-        resultData.put("czxz", czxz);
-        resultData.put("czjs", czjs);
-        resultData.put("hjxz", hjxz);
-        resultData.put("hjjs", hjjs);
-        return resultData;
+            resultData.put("time", xData);
+            resultData.put("czxz", czxz);
+            resultData.put("czjs", czjs);
+            resultData.put("hjxz", hjxz);
+            resultData.put("hjjs", hjjs);
+            ECHARTS_LINE = resultData;
+            redisService.setCacheObject("hjczLine", resultData);
+        });
+
+        return ECHARTS_LINE;
     }
 
     /**

boman-web-core/src/main/java/com/boman/web/core/service/czrk/ICzrkJzdzService.java

@@ -66,4 +66,5 @@ public interface ICzrkJzdzService {
     List<Long> listCzrkIdByTypeAreaIdUserName(int type, Long areaId, String userName);
 
     int updateByIdCard(CzrkJzdz czrkJzdz);
+    int updateByCzrkId(CzrkJzdz czrkJzdz);
 }

boman-web-core/src/main/resources/mapper/CzrkJzdzMapper.xml

@@ -175,6 +175,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id_card = #{idCard}
     </update>
 
+    <update id="updateByCzrkId" >
+        update czrk_jzdz
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="czrkId != null">czrk_id = #{czrkId},</if>
+            <if test="idCard != null">id_card = #{idCard},</if>
+            <if test="userName != null">user_name = #{userName},</if>
+            <if test="sort != null">sort = #{sort},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="provinceId != null">province_id = #{provinceId},</if>
+            <if test="province != null">province = #{province},</if>
+            <if test="cityId != null">city_id = #{cityId},</if>
+            <if test="city != null">city = #{city},</if>
+            <if test="regionId != null">region_id = #{regionId},</if>
+            <if test="region != null">region = #{region},</if>
+            <if test="townId != null">town_id = #{townId},</if>
+            <if test="town != null">town = #{town},</if>
+            <if test="villageId != null">village_id = #{villageId},</if>
+            <if test="village != null">village = #{village},</if>
+            <if test="nowIn != null">now_in = #{nowIn},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = sysdate(),</if>
+            <if test="status != null">status = #{status},</if>
+        </trim>
+        where czrk_id = #{czrkId}
+    </update>
+
     <delete id="deleteCzrkJzdzById" parameterType="Long">
         delete from czrk_jzdz where id = #{id}
     </delete>

boman-web-core/src/main/resources/mapper/CzrkMapper.xml

@@ -124,15 +124,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ANY_VALUE(czrk.user_name) userName,
             ANY_VALUE(czrk.phone_num) phoneNum,
             ANY_VALUE(czrk.id_card) idCard,
-            ANY_VALUE(czrk.gender),
-            ANY_VALUE(czrk.province),
-            ANY_VALUE(czrk.is_rl),
-            ANY_VALUE(czrk.city),
-            ANY_VALUE(czrk.region),
+            ANY_VALUE(czrk.gender) gender,
+            ANY_VALUE(czrk.province) province,
+            ANY_VALUE(czrk.is_rl) isRl,
+            ANY_VALUE(czrk.city) city,
+            ANY_VALUE(czrk.region) region,
             ANY_VALUE(czrk.house_type) houseType,
             ANY_VALUE(czrk.update_by) updateBy,
-            ANY_VALUE(czrk. CODE),
-            ANY_VALUE(czrk.rlr),
+            ANY_VALUE(czrk. CODE) CODE,
+            ANY_VALUE(czrk.rlr) rlr,
             ANY_VALUE(czrk.update_time) updateTime,
             ANY_VALUE(czrk.delete_reason) deleteReason,
             ANY_VALUE(czrk.now_in) nowIn,
@@ -145,6 +145,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from czrk
         left join czrk_jzdz jzdz on czrk.id = jzdz.czrk_id
         <where>
+            jzdz.status = 'Y'
             <!-- 已认领 -->
             <if test="isRl != null and isRl != ''">and czrk.is_rl = #{isRl}</if>
 
@@ -424,6 +425,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="keyIndustries != null">key_Industries,</if>
             <if test="houseType != null">house_type,</if>
             <if test="rlr != null">rlr,</if>
+            <if test="isRl != null">is_rl,</if>
             <if test="rlTime != null">rl_time,</if>
             <if test="yhzgx != null">yhzgx,</if>
             <if test="workUnit != null">work_unit,</if>
@@ -461,6 +463,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="keyIndustries != null">#{keyIndustries},</if>
             <if test="houseType != null">#{houseType},</if>
             <if test="rlr != null">#{rlr},</if>
+            <if test="isRl != null">#{isRl},</if>
             <if test="rlTime != null">#{rlTime},</if>
             <if test="yhzgx != null">#{yhzgx},</if>
             <if test="workUnit != null">#{workUnit},</if>
@@ -501,6 +504,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="keyIndustries != null">key_industries = #{keyIndustries},</if>
             <if test="houseType != null">house_type = #{houseType},</if>
             <if test="rlr != null">rlr = #{rlr},</if>
+            <if test="isRl != null">is_rl = #{isRl},</if>
             <if test="rlTime != null">rl_time = #{rlTime},</if>
             <if test="yhzgx != null">yhzgx = #{yhzgx},</if>
             <if test="workUnit != null">work_unit = #{workUnit},</if>
@@ -578,7 +582,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from czrk
         left join czrk_jzdz jzdz on czrk.id = jzdz.czrk_id
         <where>
-            czrk.is_del = 'N'
+            czrk.is_del = 'N' and jzdz.status = 'Y'
             <if test="userName != null  and userName != ''">
                 and (czrk.user_name like concat('%', #{userName}, '%') or czrk.id_card like concat('%', #{userName}, '%'))
             </if>