youhua代码

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/service/ICoreEvaluatePlanService.java

@@ -6,11 +6,8 @@ import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.core.evaluate.domain.CoreEvaluatePlan;
 import com.xunmei.core.evaluate.dto.CoreEvaluatePlanDTO;
 import com.xunmei.core.evaluate.dto.EvaluateQueryDTO;
-import com.xunmei.core.evaluate.dto.EvaluateTaskStatisticsDTO;
 import com.xunmei.core.evaluate.vo.CoreEvaluatePlanListVO;
 import com.xunmei.core.evaluate.vo.CoreEvaluatePlanVO;
-
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/service/ICoreEvaluateTaskService.java

@@ -13,7 +13,6 @@ import com.xunmei.core.evaluate.vo.CoreEvaluateTaskVO;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/service/impl/CoreEvaluatePlanServiceImpl.java

@@ -15,7 +15,6 @@ import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.core.evaluate.domain.*;
 import com.xunmei.core.evaluate.dto.CoreEvaluatePlanDTO;
 import com.xunmei.core.evaluate.dto.EvaluateQueryDTO;
-import com.xunmei.core.evaluate.dto.EvaluateTaskStatisticsDTO;
 import com.xunmei.core.evaluate.mapper.*;
 import com.xunmei.core.evaluate.service.ICoreEvaluatePlanService;
 import com.xunmei.core.evaluate.service.ICoreEvaluateTaskService;
@@ -31,7 +30,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.ZoneId;
@@ -207,9 +205,6 @@ public class CoreEvaluatePlanServiceImpl extends ServiceImpl<CoreEvaluatePlanMap
      */
     @Override
     public int updateCoreEvaluatePlan(CoreEvaluatePlanDTO coreEvaluatePlanDTO) {
-/*        if (!check(SecurityUtils.getUserId())) {
-            throw new RuntimeException("该角色没有修改权限");
-        }*/
         CoreEvaluatePlan coreEvaluatePlan = coreEvaluatePlanMapper.selectCoreEvaluatePlanById(coreEvaluatePlanDTO.getId());
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq("org_id", coreEvaluatePlan.getOrgId());
@@ -342,10 +337,6 @@ public class CoreEvaluatePlanServiceImpl extends ServiceImpl<CoreEvaluatePlanMap
         if (cycle.equals("2")) {
             this.yearTask();
         }
-//        List<CoreEvaluatePlan> coreEvaluatePlans = baseMapper.selectPlanByCycle(cycle);
-//        coreEvaluatePlans.forEach(c -> {
-//            distribute(c.getId());
-//        });
     }
 
     public LocalDate getTime(int time) {

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/service/impl/CoreEvaluateTaskServiceImpl.java

@@ -180,7 +180,7 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
         }
         EvaluateTaskExportVO evaluateTaskExportVO = new EvaluateTaskExportVO();
         evaluateTaskExportVO.setOrgName("平均得分");
-        evaluateTaskExportVO.setScore((double) all / list.size());
+        evaluateTaskExportVO.setScore(all / list.size());
         list.add(evaluateTaskExportVO);
         if (ObjectUtil.isEmpty(list)) {
             throw new RuntimeException("导出数据为空!");

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/information/service/ICoreMessageCenterService.java

@@ -3,7 +3,6 @@ package com.xunmei.core.information.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.xunmei.common.core.web.page.TableDataInfo;
-import com.xunmei.core.access.dto.CoreMonitoringTaskRegistrationDTO;
 import com.xunmei.core.information.domain.CoreMessageCenter;
 import com.xunmei.core.information.dto.CoreMessageCenterDTO;
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/information/service/ICoreMessageSendService.java

@@ -3,7 +3,6 @@ package com.xunmei.core.information.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.xunmei.common.core.web.page.TableDataInfo;
-import com.xunmei.core.access.dto.CoreMonitoringTaskRegistrationDTO;
 import com.xunmei.core.information.domain.CoreMessageSend;
 import com.xunmei.core.information.dto.CoreMessageSendDTO;
 

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysAreaCheckController.java

@@ -5,12 +5,9 @@ import java.util.stream.Collectors;
 
 import com.xunmei.common.core.vo.IdNameVo;
 import com.xunmei.system.api.domain.SysArea;
-import com.xunmei.system.api.domain.SysOrg;
-import com.xunmei.system.domain.vo.SysAreaCheckVO;
 import com.xunmei.system.dto.SysAreaCheckDTO;
 import com.xunmei.system.mapper.SysOrgMapper;
 import com.xunmei.system.service.ISysAreaService;
-import com.xunmei.system.service.ISysNfcBindService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -45,8 +42,6 @@ public class SysAreaCheckController extends BaseController {
     private ISysAreaCheckService sysAreaCheckService;
     @Autowired
     private ISysAreaService sysAreaService;
-    @Autowired
-    private SysOrgMapper sysOrgMapper;
 
     /**
      * 查询区域采集点列表

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysAreaController.java

@@ -1,9 +1,6 @@
 package com.xunmei.system.controller;
 
-
-import com.xunmei.common.core.exception.ServiceException;
 import com.xunmei.system.api.domain.SysArea;
-import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.mapper.SysOrgMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -38,6 +35,7 @@ public class SysAreaController extends BaseController {
     private ISysAreaService sysAreaService;
     @Autowired
     private SysOrgMapper sysOrgMapper;
+
     /**
      * 查询【请填写功能名称】列表
      */
@@ -67,6 +65,7 @@ public class SysAreaController extends BaseController {
     public AjaxResult getAreaByOrg(@PathVariable("orgId") Long orgId) {
         return success(sysAreaService.getAreaByOrg(orgId));
     }
+
     /**
      * 新增【请填写功能名称】
      */
@@ -101,7 +100,7 @@ public class SysAreaController extends BaseController {
     }
 
     /**
-     *按机构类型获取所有区域
+     * 按机构类型获取所有区域
      */
     @ApiOperation(value = "按机构类型获取所有区域")
 //    @RequiresPermissions("system:area:list
@@ -111,7 +110,7 @@ public class SysAreaController extends BaseController {
         condition.setOrgType(orgType.toString());
         condition.setPageNum(1L);
         condition.setPageSize(9999L);
-        TableDataInfo table= sysAreaService.selectPage(condition);
+        TableDataInfo table = sysAreaService.selectPage(condition);
         return success(table.getRows());
     }
 }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysDeviceController.java

@@ -13,14 +13,10 @@ import com.xunmei.common.security.annotation.InnerAuth;
 import com.xunmei.system.api.domain.SysDevice;
 import com.xunmei.system.api.domain.SysDictData;
 import com.xunmei.system.api.domain.SysOrg;
-import com.xunmei.system.api.domain.SysRole;
-import com.xunmei.system.domain.SysUserRole;
 import com.xunmei.system.service.ISysDictDataService;
 import com.xunmei.system.service.ISysDictTypeService;
 import com.xunmei.system.service.ISysOrgService;
-import com.xunmei.system.service.impl.SysDeviceServiceImpl;
 import com.xunmei.system.util.DeviceExport;
-import com.xunmei.system.util.UserExport;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/SysAreaCheckMapper.java

@@ -3,7 +3,6 @@ package com.xunmei.system.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.xunmei.system.api.domain.SysArea;
 import com.xunmei.system.domain.SysAreaCheck;
 import com.xunmei.system.domain.vo.SysAreaCheckVO;
 import com.xunmei.system.dto.SysAreaCheckDTO;
@@ -13,7 +12,6 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 
-
 /**
  * 区域采集点Mapper接口
  *
@@ -29,30 +27,34 @@ public interface SysAreaCheckMapper extends BaseMapper<SysAreaCheck> {
      * @param id 区域采集点主键
      * @return 区域采集点
      */
-     SysAreaCheck selectSysAreaCheckById(Long id);
+    SysAreaCheck selectSysAreaCheckById(Long id);
 
     /**
      * 采集点列表
+     *
      * @param page
      * @param sysArea
      * @return
      */
     Page<SysAreaCheck> selectSysAreaVO(Page<SysAreaCheck> page, @Param("sysAreaCheck") SysAreaCheckDTO sysAreaCheck);
+
     /**
      * 查询区域采集点列表
      *
      * @param sysAreaCheck 区域采集点
      * @return 区域采集点集合
      */
-     List<SysAreaCheck> selectSysAreaCheckList(SysAreaCheck sysAreaCheck);
-IPage<SysAreaCheckVO> selectByPage(IPage<?>page,Integer id);
+    List<SysAreaCheck> selectSysAreaCheckList(SysAreaCheck sysAreaCheck);
+
+    IPage<SysAreaCheckVO> selectByPage(IPage<?> page, Integer id);
+
     /**
      * 新增区域采集点
      *
      * @param sysAreaCheck 区域采集点
      * @return 结果
      */
-     int insertSysAreaCheck(SysAreaCheck sysAreaCheck);
+    int insertSysAreaCheck(SysAreaCheck sysAreaCheck);
 
     /**
      * 修改区域采集点
@@ -60,7 +62,7 @@ IPage<SysAreaCheckVO> selectByPage(IPage<?>page,Integer id);
      * @param sysAreaCheck 区域采集点
      * @return 结果
      */
-     int updateSysAreaCheck(SysAreaCheck sysAreaCheck);
+    int updateSysAreaCheck(SysAreaCheck sysAreaCheck);
 
     /**
      * 删除区域采集点
@@ -68,7 +70,7 @@ IPage<SysAreaCheckVO> selectByPage(IPage<?>page,Integer id);
      * @param id 区域采集点主键
      * @return 结果
      */
-     int deleteSysAreaCheckById(Long id);
+    int deleteSysAreaCheckById(Long id);
 
     /**
      * 批量删除区域采集点
@@ -76,5 +78,5 @@ IPage<SysAreaCheckVO> selectByPage(IPage<?>page,Integer id);
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-     int deleteSysAreaCheckByIds(Long[] ids);
+    int deleteSysAreaCheckByIds(Long[] ids);
 }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/SysDeviceMapper.java

@@ -1,12 +1,10 @@
 package com.xunmei.system.mapper;
 
 import java.util.List;
-import java.util.Map;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xunmei.system.api.domain.SysDevice;
 import com.xunmei.system.vo.area.AccessType;
-import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
 

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/SysNfcBindMapper.java

@@ -3,7 +3,6 @@ package com.xunmei.system.mapper;
 import java.util.List;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.xunmei.system.api.domain.SysUser;
 import com.xunmei.system.domain.SysNfcBind;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xunmei.system.dto.SysNfcBindDTO;
@@ -44,7 +43,9 @@ public interface SysNfcBindMapper extends BaseMapper<SysNfcBind> {
     Page<SysNfcBind> selectNFCPage(Page<SysNfcBind> page, @Param("info") SysNfcBindDTO info);
 
     SysNfcBind selectSysNfcBindByCode(String code);
+
     List<Long> selectSysNfcBindByCodeAndOrgId(String code);
+
     /**
      * 修改区域名称
      *

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/ISysDictDataService.java

@@ -12,8 +12,7 @@ import java.util.List;
  *
  * @author xunmei
  */
-public interface ISysDictDataService extends IService<SysDictData>
-{
+public interface ISysDictDataService extends IService<SysDictData> {
     /**
      * 根据条件分页查询字典数据
      *
@@ -25,12 +24,14 @@ public interface ISysDictDataService extends IService<SysDictData>
     /**
      * 根据字典类型和字典键值查询字典数据信息
      *
-     * @param dictType 字典类型
+     * @param dictType  字典类型
      * @param dictValue 字典键值
      * @return 字典标签
      */
     String selectDictLabel(String dictType, String dictValue);
-String selectDictValue(String dictType,String dictLabel);
+
+    String selectDictValue(String dictType, String dictLabel);
+
     /**
      * 根据字典数据ID查询信息
      *

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysAreaCheckServiceImpl.java

@@ -1,21 +1,13 @@
 package com.xunmei.system.service.impl;
 
-import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.xunmei.common.core.constant.CacheConstants;
 import com.xunmei.common.core.exception.ServiceException;
 import com.xunmei.common.core.utils.DateUtils;
-import com.xunmei.common.core.utils.bean.BeanUtils;
-import com.xunmei.common.redis.utils.RedisUtils;
 import com.xunmei.common.security.utils.SecurityUtils;
-import com.xunmei.system.api.domain.SysArea;
 import com.xunmei.system.api.domain.SysOrg;
-import com.xunmei.system.api.vo.SysOrgVO;
 import com.xunmei.system.domain.SysNfcBind;
-import com.xunmei.system.domain.vo.SysAreaCheckVO;
 import com.xunmei.system.dto.SysAreaCheckDTO;
 import com.xunmei.system.mapper.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -46,6 +38,7 @@ public class SysAreaCheckServiceImpl extends ServiceImpl<SysAreaCheckMapper, Sys
     private SysDictDataMapper sysDictDataMapper;
     @Autowired
     private SysOrgMapper sysOrgMapper;
+    private static final String DEL_FLAG = "del_flag";
 
     @Override
     public TableDataInfo<SysAreaCheck> selectPage(SysAreaCheckDTO sysAreaCheck) {
@@ -125,7 +118,7 @@ public class SysAreaCheckServiceImpl extends ServiceImpl<SysAreaCheckMapper, Sys
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq("check_name", sysAreaCheck.getCheckName());
         queryWrapper.eq("org_type", sysAreaCheck.getOrgType());
-        queryWrapper.eq("del_flag", 0);
+        queryWrapper.eq(DEL_FLAG, 0);
         Long aLong = baseMapper.selectCount(queryWrapper);
         if (aLong > 0) {
             throw new ServiceException("【NFC点位】不能重复");
@@ -149,7 +142,7 @@ public class SysAreaCheckServiceImpl extends ServiceImpl<SysAreaCheckMapper, Sys
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq("check_name", sysAreaCheck.getCheckName());
         queryWrapper.eq("org_type", sysAreaCheck.getOrgType());
-        queryWrapper.eq("del_flag", 0);
+        queryWrapper.eq(DEL_FLAG, 0);
         SysAreaCheck sysAreaCheck1 = baseMapper.selectOne(queryWrapper);
         if (null != sysAreaCheck1 && !sysAreaCheck1.getId().equals(sysAreaCheck.getId())) {
             throw new ServiceException("名称不能重复");
@@ -176,7 +169,7 @@ public class SysAreaCheckServiceImpl extends ServiceImpl<SysAreaCheckMapper, Sys
     public int deleteSysAreaCheckByIds(Long[] ids) {
         //判断是否使用
         QueryWrapper<SysNfcBind> query = new QueryWrapper<>(new SysNfcBind());
-        query.eq("del_flag", "0");
+        query.eq(DEL_FLAG, "0");
         query.in("check_id", ids);
         List<SysNfcBind> sysNfcBinds = sysNfcBindMapper.selectList(query);
         if (CollectionUtils.isNotEmpty(sysNfcBinds)) {