screen-api/src/main/java/com/moral/api/controller/AllocationController.java
@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.apache.commons.collections4.CollectionUtils; import org.aspectj.apache.bcel.generic.RET; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -14,14 +15,24 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.moral.api.entity.Allocation; import com.moral.api.entity.ResponsibilityUnit; import com.moral.api.pojo.dto.allocation.AllocationUnitViewDto; import com.moral.api.service.AllocationService; import com.moral.api.utils.EasyExcelUtils; import com.moral.api.utils.NoModelWriteData; import com.moral.constant.Constants; import com.moral.constant.ResultMessage; import com.moral.util.WebUtils; @Api(tags = {"立行立改"}) @@ -99,4 +110,71 @@ return ResultMessage.ok(); } /** * 查询表单总览 * @return */ @GetMapping("selectUnitView") public ResultMessage selectUnitView(HttpServletRequest request){ Map<String, Object> params = WebUtils.getParametersStartingWith(request, null); Map<String, Object> map1 = allocationService.selectUnitView(params); return ResultMessage.ok(map1); } @GetMapping("unitExel") public void unitExel(HttpServletResponse response,HttpServletRequest request){ Map<String, Object> params = WebUtils.getParametersStartingWith(request, null); //数据集合 Map<String, Object> map1 = allocationService.selectUnitView(params); List<AllocationUnitViewDto> unitView = (List<AllocationUnitViewDto>) map1.get("unitView"); ArrayList<Map<String, Object>> mapArrayList = new ArrayList<>(); for (AllocationUnitViewDto allocationUnitViewDto : unitView) { Map<String, Object> map = entityToMap(allocationUnitViewDto); mapArrayList.add(map); } if (CollectionUtils.isEmpty(mapArrayList)) { return; } Map<String, Object> map = mapArrayList.get(0); List<String> list = new ArrayList<>(); for (String key : map.keySet()) { list.add(key); } String[] s2 = new String[list.size()]; list.toArray(s2); NoModelWriteData d = new NoModelWriteData(); d.setFileName("数据导出"); d.setHeadMap(s2); d.setDataStrMap(s2); d.setDataList(mapArrayList); try { EasyExcelUtils easyExcelUtils = new EasyExcelUtils(); easyExcelUtils.noModleWrite(d, response); } catch (Exception e) { int i = 0; } } /** 实体类转Map */ public static Map<String, Object> entityToMap(Object object) { Map<String, Object> map = new HashMap<>(); for (Field field : object.getClass().getDeclaredFields()) { try { boolean flag = field.isAccessible(); field.setAccessible(true); Object o = field.get(object); map.put(field.getName(), o); field.setAccessible(flag); } catch (Exception e) { e.printStackTrace(); } } return map; } } screen-api/src/main/java/com/moral/api/entity/ResponsibilityUnit.java
@@ -6,7 +6,9 @@ import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.fasterxml.jackson.annotation.JsonFormat; @@ -15,6 +17,7 @@ public class ResponsibilityUnit extends Model<ResponsibilityUnit> { //责任单位id @TableId(value = "unit_id", type = IdType.AUTO) private Integer unitId; private String unitName; screen-api/src/main/java/com/moral/api/entity/User.java
@@ -1,6 +1,7 @@ package com.moral.api.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; @@ -76,6 +77,9 @@ */ private String wechat; private Integer unitId; /** * 创建时间 */ @@ -100,5 +104,8 @@ */ private String isDelete; @TableField(exist = false) private Integer unitCode; } screen-api/src/main/java/com/moral/api/pojo/dto/allocation/AllocationUnitViewDto.java
New file @@ -0,0 +1,46 @@ package com.moral.api.pojo.dto.allocation; import lombok.Data; @Data public class AllocationUnitViewDto { private String unitName; /** * 总数 */ private Integer total; /** * 完成数 */ private Integer number; /** *未完成数 */ private Integer unNumber; /** * 完成率 */ private String rate; /** * 减分 */ private Integer deduction; /** * 加分 */ private Integer marks; /** * 总分 */ private Integer totalPoints; } screen-api/src/main/java/com/moral/api/service/AllocationService.java
@@ -24,4 +24,9 @@ List<Allocation> selectAll(Map<String,Object> map); Map<String, Object> selectUnitView(Map<String,Object> map); List<Map<String,Object>> unitExel(Map<String,Object> map); } screen-api/src/main/java/com/moral/api/service/ResponsibilityUnitService.java
New file @@ -0,0 +1,27 @@ package com.moral.api.service; import java.util.List; import java.util.Map; import com.baomidou.mybatisplus.extension.service.IService; import com.moral.api.entity.ResponsibilityUnit; public interface ResponsibilityUnitService extends IService<ResponsibilityUnit> { /** * 根据上级区域编码或者数据 * @param code * @return */ List<ResponsibilityUnit> selectUnit(Integer code); /** * 根据本地区域获取单位主体数据 * @param code * @return */ ResponsibilityUnit selectAreaUnit(Integer code); } screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
@@ -10,8 +10,12 @@ import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; import java.util.stream.Collectors; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -19,6 +23,7 @@ import com.moral.api.entity.Allocation; import com.moral.api.entity.ApproveTable; import com.moral.api.entity.ResponsibilityUnit; import com.moral.api.entity.SysArea; import com.moral.api.entity.SysDictData; import com.moral.api.entity.SysDictType; import com.moral.api.mapper.AllocationMapper; @@ -28,9 +33,13 @@ import com.moral.api.mapper.SysDictDataMapper; import com.moral.api.mapper.SysDictTypeMapper; import com.moral.api.pojo.dto.allocation.AllocationUnitDto; import com.moral.api.pojo.dto.allocation.AllocationUnitViewDto; import com.moral.api.pojo.enums.AllocationApproveEnum; import com.moral.api.pojo.vo.file.FileVo; import com.moral.api.service.AllocationService; import com.moral.api.service.FileTableService; import com.moral.api.service.SysAreaService; import com.moral.api.service.SysDictDataService; import com.moral.constant.Constants; import com.moral.constant.RedisConstants; import com.moral.util.DateUtils; @@ -53,6 +62,8 @@ private AllocationMapper allocationMapper; @Autowired private ApproveTableMapper approveTableMapper; @Autowired private SysAreaService sysAreaService; /** * 根据字典类型获取字典数据 @@ -252,4 +263,175 @@ } return null; } /** * 表单总览 * @param map * @return */ @Override public Map<String, Object> selectUnitView(Map<String, Object> map) { QueryWrapper<Allocation> wrapper = new QueryWrapper<>(); //获取用户信息 // Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfo(); // Object unitId = userInfo.get("unitId"); Integer unitId= 17; if (!ObjectUtils.isEmpty(unitId)){ ResponsibilityUnit responsibilityUnit1 = responsibilityUnitMapper.selectById(unitId); Integer areaCode = responsibilityUnit1.getAreaCode(); if (areaCode<999999){ QueryWrapper<ResponsibilityUnit> wrapper1 = new QueryWrapper<>(); wrapper1.eq("parent_code",areaCode); List<ResponsibilityUnit> responsibilityUnits = responsibilityUnitMapper.selectList(wrapper1); if (ObjectUtils.isEmpty(responsibilityUnits)){ return null; } Map<Integer, List<ResponsibilityUnit>> collect = responsibilityUnits.stream().collect(Collectors.groupingBy(o -> o.getUnitId())); List<Integer> collect1 = collect.keySet().stream().collect(Collectors.toList()); wrapper.in("unit_id",collect1); }else { wrapper.eq("unit_id",unitId); } } HashMap<String, Object> rsMap = new HashMap<>(); HashMap<String, Object> polluteMap = new HashMap<>(); ArrayList<AllocationUnitViewDto> allocationUnitViewDtos = new ArrayList<>(); Object number1 = map.get("number"); String startTime=null; String endTime=null; if (!ObjectUtils.isEmpty(map.get("startTime")) || !ObjectUtils.isEmpty(map.get("startTime"))){ startTime = map.get("startTime").toString(); endTime = map.get("endTime").toString(); } if (!ObjectUtils.isEmpty(number1)){ String s = number1.toString(); //当前时间的 endTime = DateUtils.getCurDateTime(); if (s.equals("-1")){ //当前时间的 startTime = DateUtils.getDateStringOfMon(Integer.parseInt(s), DateUtils.yyyy_MM_dd_HH_mm_ss_EN); } if (s.equals("-2")){ //当前时间的 startTime = DateUtils.getDateStringOfMon(Integer.parseInt(s), DateUtils.yyyy_MM_dd_HH_mm_ss_EN); } if (s.equals("-3")){ startTime = DateUtils.getDateStringOfMon(Integer.parseInt(s), DateUtils.yyyy_MM_dd_HH_mm_ss_EN); } if (s.equals("-6")){ startTime = DateUtils.getDateStringOfMon(Integer.parseInt(s), DateUtils.yyyy_MM_dd_HH_mm_ss_EN); } if (s.equals("-12")){ startTime = DateUtils.getDateStringOfMon(Integer.parseInt(s), DateUtils.yyyy_MM_dd_HH_mm_ss_EN); } } wrapper.between("escalation_time",startTime,endTime); wrapper.eq("is_del",0); wrapper.eq("is_invalid",0); List<Allocation> allocations = allocationMapper.selectList(wrapper); if (ObjectUtils.isEmpty(allocations)){ return null; } int complete=0; int unComplete=0; for (Allocation allocation : allocations) { String state = allocation.getState(); if (state.equals("40")||state.equals("50")){ complete++; }else if(state.equals("10")||state.equals("20") ||state.equals("30")) { unComplete++; } } //根据污染类型分类 Map<Integer, List<Allocation>> polluteTypeMap = allocations.stream().collect(Collectors.groupingBy(o -> o.getPolluteType())); Set<Integer> polluteTypes = polluteTypeMap.keySet(); for (Integer polluteType : polluteTypes) { HashMap<String, Object> typeMap = new HashMap<>(); List<Allocation> allocations1 = polluteTypeMap.get(polluteType); QueryWrapper<SysDictData> sysDictDataQueryWrapper = new QueryWrapper<>(); sysDictDataQueryWrapper.eq("dict_type_id",31); sysDictDataQueryWrapper.eq("dataKey",polluteType); SysDictData sysDictData = sysDictDataMapper.selectOne(sysDictDataQueryWrapper); typeMap.put("name",sysDictData.getDataValue()); typeMap.put("value",allocations1.size()); polluteMap.put("polluteType",typeMap); } //根据责任单位分类 Map<Integer, List<Allocation>> unitMap = allocations.stream().collect(Collectors.groupingBy(o -> o.getUnitId())); Set<Integer> unitList = unitMap.keySet(); //逾期次数 int overdue=0; for (Integer integer : unitList) { //获取城市 ResponsibilityUnit responsibilityUnit = responsibilityUnitMapper.selectById(integer); SysArea areaByCode = sysAreaService.getAreaByCode(responsibilityUnit.getAreaCode()); AllocationUnitViewDto allocationUnitViewDto = new AllocationUnitViewDto(); List<Allocation> allocations1 = unitMap.get(integer); //加分 int marks=0; //减分 int deduction=0; int number=0; for (Allocation allocation : allocations1) { Date dateOfDay = DateUtils.getDateOfDay(allocation.getEscalationTime(), allocation.getChangeDay()); Date date = new Date(); String state = allocation.getState(); boolean timeBefor = DateUtils.isTimeBefor(date, dateOfDay); if (timeBefor && !state.equals("40") && !state.equals("50")){ //逾期次数 overdue++; } if (state.equals("40")||state.equals("50")){ if (allocation.getCheckScore()>0){ marks = marks + allocation.getCheckScore(); }else { deduction = deduction + allocation.getCheckScore(); } number++; } } int total = allocations1.size(); allocationUnitViewDto.setDeduction(deduction); allocationUnitViewDto.setMarks(marks); allocationUnitViewDto.setTotal(total); allocationUnitViewDto.setTotalPoints(marks+deduction); allocationUnitViewDto.setNumber(number); String rate = (number * 100 /total)+"%"; allocationUnitViewDto.setRate(rate); allocationUnitViewDto.setUnNumber(total-number); allocationUnitViewDto.setUnitName(areaByCode.getAreaName()); allocationUnitViewDtos.add(allocationUnitViewDto); } rsMap.put("unitView",allocationUnitViewDtos); rsMap.put("total",allocations.size()); rsMap.put("complete",complete); rsMap.put("unComplete",unComplete); rsMap.put("overdue",overdue); rsMap.put("polluteType",polluteMap); return rsMap; } /** * 导出 * @param map * @return */ @Override public List<Map<String, Object>> unitExel(Map<String, Object> map) { return null; } } screen-api/src/main/java/com/moral/api/service/impl/ResponsibilityUnitServiceImpl.java
New file @@ -0,0 +1,53 @@ package com.moral.api.service.impl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.moral.api.entity.ResponsibilityUnit; import com.moral.api.mapper.ResponsibilityUnitMapper; import com.moral.api.service.ResponsibilityUnitService; @Service public class ResponsibilityUnitServiceImpl extends ServiceImpl<ResponsibilityUnitMapper, ResponsibilityUnit> implements ResponsibilityUnitService { @Autowired private ResponsibilityUnitMapper responsibilityUnitMapper; /** * 根据上级区域编码或者数据 * * @param code * @return */ @Override public List<ResponsibilityUnit> selectUnit(Integer code) { QueryWrapper<ResponsibilityUnit> wrapper = new QueryWrapper<>(); wrapper.eq("parent_code",code); wrapper.eq("is_del",0); wrapper.eq("state",0); wrapper.eq("is_invalid",0); List<ResponsibilityUnit> responsibilityUnits = responsibilityUnitMapper.selectList(wrapper); return responsibilityUnits; } /** * 根据本地区域获取单位主体数据 * * @param code * @return */ @Override public ResponsibilityUnit selectAreaUnit(Integer code) { QueryWrapper<ResponsibilityUnit> wrapper = new QueryWrapper<>(); wrapper.eq("area_code",code); wrapper.eq("is_del",0); wrapper.eq("state",0); wrapper.eq("is_invalid",0); ResponsibilityUnit responsibilityUnit = responsibilityUnitMapper.selectOne(wrapper); return responsibilityUnit; } } screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
@@ -30,14 +30,17 @@ import com.moral.api.entity.Group; import com.moral.api.entity.Menu; import com.moral.api.entity.Organization; import com.moral.api.entity.ResponsibilityUnit; import com.moral.api.entity.User; import com.moral.api.entity.UserGroup; import com.moral.api.entity.UserLog; import com.moral.api.mapper.MenuMapper; import com.moral.api.mapper.ResponsibilityUnitMapper; import com.moral.api.mapper.UserGroupMapper; import com.moral.api.mapper.UserLogMapper; import com.moral.api.mapper.UserMapper; import com.moral.api.pojo.bo.UserBO; import com.moral.api.service.ResponsibilityUnitService; import com.moral.api.service.UserService; import com.moral.api.utils.OperationLogUtils; import com.moral.constant.Constants; @@ -76,6 +79,9 @@ @Autowired private OperationLogUtils operationLogUtils; @Autowired private ResponsibilityUnitService responsibilityUnitService; @Value("${AES.KEY}") private String AESKey; @@ -125,6 +131,7 @@ userInfo.put("userName", userBo.getUserName()); userInfo.put("email", userBo.getEmail()); userInfo.put("mobile", userBo.getMobile()); userInfo.put("unitId",userBo.getUnitId()); userInfo.put("wechat", userBo.getWechat()); userInfo.put("expireTime", DateUtils.dateToDateString(userBo.getExpireTime())); userInfo.put("isAdmin", userBo.getIsAdmin()); @@ -281,6 +288,8 @@ result.put("msg", ResponseCodeEnum.MOBILE_INVALID.getMsg()); return result; } ResponsibilityUnit responsibilityUnit = responsibilityUnitService.selectAreaUnit(user.getUnitCode()); user.setUnitId(responsibilityUnit.getUnitId()); //密码加密 user.setPassword(MD5Utils.saltMD5(password)); Map<String, Object> orgInfo = (Map<String, Object>) currentUserInfo.get("organization"); @@ -400,6 +409,8 @@ String deleteToken = TokenUtils.hget(userId).toString(); TokenUtils.destoryToken(userId, deleteToken); } ResponsibilityUnit responsibilityUnit = responsibilityUnitService.selectAreaUnit(user.getUnitCode()); user.setUnitId(responsibilityUnit.getUnitId()); userMapper.updateById(user); //日志