采集点功能和系统参数功能

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

@@ -6,6 +6,8 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.xunmei.system.api.domain.SysArea;
 import com.xunmei.system.domain.SysNfcBind;
+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;
@@ -39,7 +41,10 @@ import com.xunmei.common.core.web.page.TableDataInfo;
 public class SysAreaCheckController extends BaseController {
     @Autowired
     private ISysAreaCheckService sysAreaCheckService;
-
+    @Autowired
+    private ISysNfcBindService sysNfcBindService;
+    @Autowired
+    private ISysAreaService sysAreaService;
     /**
      * 查询区域采集点列表
      */
@@ -57,9 +62,14 @@ public class SysAreaCheckController extends BaseController {
      */
     @ApiOperation(value = "获取SysAreaCheck详细信息")
     @RequiresPermissions("system:check:query")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return success(sysAreaCheckService.selectSysAreaCheckById(id));
+    @GetMapping(value = {"/", "/{id}"})
+    public AjaxResult getInfo(@PathVariable(value = "id", required = false) Long id) {
+        AjaxResult ajax = AjaxResult.success();
+        SysAreaCheck areaCheck = sysAreaCheckService.selectSysAreaCheckById(id);
+        List<SysArea> sysAreas = sysAreaService.selectSysAreaList(null);
+        ajax.put(AjaxResult.DATA_TAG, areaCheck);
+        ajax.put("areas", sysAreas);
+        return ajax;
     }
 
     /**

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

@@ -35,8 +35,8 @@ public class SysConfigController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(SysConfig config)
     {
-        List<SysConfig> list = configService.selectConfigList(config);
-        return null;
+
+        return configService.selectPage(config);
     }
 
 

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/domain/SysAreaCheck.java

@@ -1,5 +1,7 @@
 package com.xunmei.system.domain;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -22,67 +24,81 @@ import com.xunmei.common.core.web.domain.BaseEntity;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("sys_area_check")
-@ApiModel(value = "SysAreaCheck对象" , description = "区域采集点")
-public class SysAreaCheck extends BaseEntity
-        {
-private static final long serialVersionUID=1L;
-
-    /** $column.columnComment */
+@ApiModel(value = "SysAreaCheck对象", description = "区域采集点")
+public class SysAreaCheck extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * $column.columnComment
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
-    /** 采集点名称 */
-            @ApiModelProperty(value = "采集点名称")
+    /**
+     * 采集点名称
+     */
+    @ApiModelProperty(value = "采集点名称")
     private String checkName;
 
-    /** 区域id */
-            @ApiModelProperty(value = "区域id")
+    /**
+     * 区域id
+     */
+    @ApiModelProperty(value = "区域id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long areaId;
 
-    /** 机构id */
-            @ApiModelProperty(value = "机构id")
+    /**
+     * 机构id
+     */
+    @ApiModelProperty(value = "机构id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long orgId;
 
-    /** 修改人id */
-            @ApiModelProperty(value = "修改人id")
+    /**
+     * 修改人id
+     */
+    @ApiModelProperty(value = "修改人id")
     private String updateId;
 
-    /** 删除标志（0代表存在 2代表删除） */
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
     private String delFlag;
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                
-@Override
-public String toString(){
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
 
 
-                .append("id" ,getId())
+                .append("id", getId())
 
 
-                .append("checkName" ,getCheckName())
+                .append("checkName", getCheckName())
 
 
-                .append("areaId" ,getAreaId())
+                .append("areaId", getAreaId())
 
 
-                .append("orgId" ,getOrgId())
+                .append("orgId", getOrgId())
 
 
-                .append("createTime" ,getCreateTime())
+                .append("createTime", getCreateTime())
 
 
-                .append("updateTime" ,getUpdateTime())
+                .append("updateTime", getUpdateTime())
 
 
-                .append("updateId" ,getUpdateId())
+                .append("updateId", getUpdateId())
 
 
-                .append("createBy" ,getCreateBy())
+                .append("createBy", getCreateBy())
 
 
-                .append("delFlag" ,getDelFlag())
+                .append("delFlag", getDelFlag())
 
 
-                .append("updateBy" ,getUpdateBy())
-        .toString();
-        }
-        }
+                .append("updateBy", getUpdateBy())
+                .toString();
+    }
+}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/domain/SysConfig.java

@@ -30,7 +30,10 @@ public class SysConfig extends BaseEntity
 
     /** 系统内置（Y是 N否） */
     private String configType;
-
+    /**
+     * 备注
+     */
+    private String remark;
     public Long getConfigId()
     {
         return configId;
@@ -86,7 +89,15 @@ public class SysConfig extends BaseEntity
     {
         this.configType = configType;
     }
-    
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -99,6 +110,7 @@ public class SysConfig extends BaseEntity
             .append("createTime", getCreateTime())
             .append("updateBy", getUpdateBy())
             .append("updateTime", getUpdateTime())
+                .append("remark",getRemark())
             .toString();
     }
 }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/domain/vo/SysAreaCheckVO.java

@@ -0,0 +1,14 @@
+package com.xunmei.system.domain.vo;
+
+import com.xunmei.system.domain.SysAreaCheck;
+import lombok.Data;
+
+/**
+ * @author :LuoWei
+ * @date : 2023/8/16
+ */
+@Data
+public class SysAreaCheckVO extends SysAreaCheck {
+    private String areaName;
+    private String orgName;
+}

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

@@ -1,11 +1,15 @@
 package com.xunmei.system.mapper;
 
-import java.util.List;
-
-import com.xunmei.system.domain.SysAreaCheck;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.xunmei.system.domain.SysAreaCheck;
+import com.xunmei.system.domain.vo.SysAreaCheckVO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
+
+
 /**
  * 区域采集点Mapper接口
  *
@@ -23,6 +27,7 @@ public interface SysAreaCheckMapper extends BaseMapper<SysAreaCheck> {
      */
     public SysAreaCheck selectSysAreaCheckById(Long id);
 
+
     /**
      * 查询区域采集点列表
      *
@@ -30,7 +35,7 @@ public interface SysAreaCheckMapper extends BaseMapper<SysAreaCheck> {
      * @return 区域采集点集合
      */
     public List<SysAreaCheck> selectSysAreaCheckList(SysAreaCheck sysAreaCheck);
-
+IPage<SysAreaCheckVO> selectByPage(IPage<?>page,Integer id);
     /**
      * 新增区域采集点
      *

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

@@ -1,6 +1,8 @@
 package com.xunmei.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.system.domain.SysAreaCheck;
 import com.xunmei.system.domain.SysConfig;
 
 import java.util.List;
@@ -13,6 +15,13 @@ import java.util.List;
 public interface ISysConfigService extends IService<SysConfig>
 {
     /**
+     * 查询区域采集点分页数据
+     *
+     * @param sysAreaCheck 查询条件对象
+     * @return Page
+     */
+    public TableDataInfo selectPage(SysConfig sysAreaCheck);
+    /**
      * 查询参数配置信息
      * 
      * @param configId 参数配置ID

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

@@ -1,7 +1,17 @@
 package com.xunmei.system.service.impl;
 
+import java.util.ArrayList;
 import java.util.List;
-        import com.xunmei.common.core.utils.DateUtils;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.xunmei.common.core.utils.DateUtils;
+import com.xunmei.common.core.utils.bean.BeanUtils;
+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.domain.vo.SysAreaCheckVO;
+import com.xunmei.system.mapper.SysAreaMapper;
+import com.xunmei.system.mapper.SysOrgMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.xunmei.system.service.ISysOrgService;
@@ -26,13 +36,12 @@ public class SysAreaCheckServiceImpl extends ServiceImpl<SysAreaCheckMapper, Sys
     private SysAreaCheckMapper sysAreaCheckMapper;
     @Autowired
     private ISysOrgService orgService;
-
+@Autowired
+private SysAreaMapper sysAreaMapper;
+@Autowired
+private SysOrgMapper sysOrgMapper;
     @Override
     public TableDataInfo selectPage(SysAreaCheck sysAreaCheck) {
-
-
-
-
         //未删除
         sysAreaCheck.setDelFlag("0");
         Page<SysAreaCheck> page;
@@ -46,6 +55,9 @@ public class SysAreaCheckServiceImpl extends ServiceImpl<SysAreaCheckMapper, Sys
         //查询条件
         QueryWrapper<SysAreaCheck> query = new QueryWrapper<>(sysAreaCheck);
         //下穿
+        //先全部查出
+        sysAreaCheck.setCheckSub(true);
+        sysAreaCheck.setOrgId(1L);
         if (sysAreaCheck.getCheckSub()){
             List<Long> ids = orgService.selectCheckSubOrgIdList(sysAreaCheck.getOrgId());
             //清空前端传递的org_id
@@ -59,12 +71,24 @@ public class SysAreaCheckServiceImpl extends ServiceImpl<SysAreaCheckMapper, Sys
         }
         //获取数据
         page = sysAreaCheckMapper.selectPage(page, query);
+
+        List<SysAreaCheckVO>list=new ArrayList<>();
+        List<SysAreaCheck> records = page.getRecords();
+        for (SysAreaCheck s:records){
+            SysAreaCheckVO sysAreaCheckVO=new SysAreaCheckVO();
+            BeanUtils.copyProperties(s,sysAreaCheckVO);
+            SysArea sysArea = sysAreaMapper.selectSysAreaById(s.getAreaId());
+            SysOrg sysOrg = sysOrgMapper.selectSysOrgById(s.getOrgId());
+            sysAreaCheckVO.setAreaName(sysArea.getName());
+            sysAreaCheckVO.setOrgName(sysOrg.getName());
+            list.add(sysAreaCheckVO);
+        }
         //抓换为TableDataInfo适配前端
         TableDataInfo tableDataInfo = new TableDataInfo();
         tableDataInfo.setMsg("操作成功");
         tableDataInfo.setCode(200);
         tableDataInfo.setTotal(page.getTotal());
-        tableDataInfo.setRows(page.getRecords());
+        tableDataInfo.setRows(list);
         return tableDataInfo;
 
 
@@ -113,6 +137,10 @@ public class SysAreaCheckServiceImpl extends ServiceImpl<SysAreaCheckMapper, Sys
     @Override
     public int insertSysAreaCheck(SysAreaCheck sysAreaCheck) {
                 sysAreaCheck.setCreateTime(DateUtils.getNowDate());
+        sysAreaCheck.setCreateBy(SecurityUtils.getUsername());
+        sysAreaCheck.setUpdateBy(SecurityUtils.getUsername());
+        sysAreaCheck.setUpdateTime(DateUtils.getNowDate());
+        sysAreaCheck.setUpdateId(SecurityUtils.getUserId().toString());
             return sysAreaCheckMapper.insert(sysAreaCheck);
     }
 
@@ -124,7 +152,9 @@ public class SysAreaCheckServiceImpl extends ServiceImpl<SysAreaCheckMapper, Sys
      */
     @Override
     public int updateSysAreaCheck(SysAreaCheck sysAreaCheck) {
-                sysAreaCheck.setUpdateTime(DateUtils.getNowDate());
+        sysAreaCheck.setUpdateBy(SecurityUtils.getUsername());
+        sysAreaCheck.setUpdateTime(DateUtils.getNowDate());
+        sysAreaCheck.setUpdateId(SecurityUtils.getUserId().toString());
         return sysAreaCheckMapper.updateById(sysAreaCheck);
     }
 

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

@@ -1,13 +1,18 @@
 package com.xunmei.system.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.constant.CacheConstants;
 import com.xunmei.common.core.constant.UserConstants;
 import com.xunmei.common.core.exception.ServiceException;
 import com.xunmei.common.core.text.Convert;
 import com.xunmei.common.core.utils.StringUtils;
+import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.common.redis.service.RedisService;
+import com.xunmei.system.api.domain.SysRole;
 import com.xunmei.system.api.domain.SysUser;
+import com.xunmei.system.domain.SysAreaCheck;
 import com.xunmei.system.domain.SysConfig;
 import com.xunmei.system.mapper.SysConfigMapper;
 import com.xunmei.system.mapper.SysUserMapper;
@@ -42,6 +47,25 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
         loadingConfigCache();
     }
 
+    @Override
+    public TableDataInfo selectPage(SysConfig sysConfig) {
+
+        Page<SysConfig> page;
+        if (sysConfig.getPageNum()!=null&&sysConfig.getPageSize()!=null)
+        {
+            page = new Page<>(sysConfig.getPageNum(), sysConfig.getPageSize());
+        }else{
+            page = new Page<>();
+        }
+        page = configMapper.selectPage( page,new QueryWrapper<>(sysConfig));
+        TableDataInfo tableDataInfo = new TableDataInfo();
+        tableDataInfo.setMsg("操作成功");
+        tableDataInfo.setCode(200);
+        tableDataInfo.setTotal(page.getTotal());
+        tableDataInfo.setRows(page.getRecords());
+        return tableDataInfo;
+    }
+
     /**
      * 查询参数配置信息
      * 

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysAreaCheckMapper.xml

@@ -46,6 +46,18 @@
             <include refid="selectSysAreaCheckVo"/>
             where id = #{id}
     </select>
+    <select id="selectByPage" resultType="com.xunmei.system.domain.vo.SysAreaCheckVO">
+        SELECT
+            sa.`name` AS areaName,
+            so.`name`
+        FROM
+            sys_area_check sac
+                LEFT JOIN sys_area sa ON sa.id = sac.area_id
+                LEFT JOIN sys_org so ON so.id = sac.org_id
+        WHERE
+            sac.id = #{id}
+
+    </select>
 
 
     <insert id="insertSysAreaCheck" parameterType="com.xunmei.system.domain.SysAreaCheck"            useGeneratedKeys="true" keyProperty="id">