xiug

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/SysDevice.java

@@ -74,13 +74,15 @@ public class SysDevice extends BaseEntity {
      * 验收日期
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiModelProperty(value = "验收日期")
+    @ApiModelProperty(value = "有效期至")
     private Date checkTime;
 
     /**
      * 保修期限默认年
      */
     @ApiModelProperty(value = "保修期限默认年")
+
+
     private String maintenanceTerm;
 
     /**

soc-auth/src/main/resources/bootstrap.yml

@@ -15,7 +15,7 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 10.87.10.54:8848
-        namespace: 598294c7-43c1-4d78-a437-21669f936cbb
+        namespace: 13d6af5d-c288-40d6-b1ee-4fc370665aba
       config:
         # 配置中心地址
         server-addr: 10.87.10.54:8848
@@ -24,7 +24,7 @@ spring:
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-        namespace: 598294c7-43c1-4d78-a437-21669f936cbb
+        namespace: 13d6af5d-c288-40d6-b1ee-4fc370665aba
 logging:
   file:
     name: logs/${spring.application.name}/info.log

soc-gateway/src/main/resources/bootstrap.yml

@@ -15,7 +15,7 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 10.87.10.54:8848
-        namespace: 083dc0cf-7829-4914-9d5c-d48f1a31015d
+        namespace: 13d6af5d-c288-40d6-b1ee-4fc370665aba
       config:
         # 配置中心地址
         server-addr: 10.87.10.54:8848
@@ -24,7 +24,7 @@ spring:
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-        namespace: 083dc0cf-7829-4914-9d5c-d48f1a31015d
+        namespace: 13d6af5d-c288-40d6-b1ee-4fc370665aba
     sentinel:
       #取消控制台懒加载
       eager: true

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/domain/TMonitoringRetrievalPlan.java

@@ -38,6 +38,7 @@ public class TMonitoringRetrievalPlan extends BaseEntity {
     @TableId(type = IdType.AUTO)
     private Long id;
     @JsonSerialize(using = ToStringSerializer.class)
+
     /**
      * 上级id
      */

soc-modules/soc-modules-core/src/main/resources/bootstrap.yml

@@ -13,11 +13,11 @@ spring:
   cloud:
     nacos:
       discovery:
-        namespace: 34306a91-1bb7-45ce-b80d-4092dd08ea64
+        namespace: 13d6af5d-c288-40d6-b1ee-4fc370665aba
         # 服务注册地址
         server-addr: 10.87.10.54:8848
       config:
-        namespace: 34306a91-1bb7-45ce-b80d-4092dd08ea64
+        namespace: 13d6af5d-c288-40d6-b1ee-4fc370665aba
         # 配置中心地址
         server-addr: 10.87.10.54:8848
         # 配置文件格式

soc-modules/soc-modules-file/src/main/resources/bootstrap.yml

@@ -13,11 +13,11 @@ spring:
   cloud:
     nacos:
       discovery:
-        namespace: 489e15c5-b16f-4c78-87f8-f398f73b6103
+
         # 服务注册地址
         server-addr: 10.87.10.54:8848
+        namespace: 13d6af5d-c288-40d6-b1ee-4fc370665aba
       config:
-        namespace: 489e15c5-b16f-4c78-87f8-f398f73b6103
         # 配置中心地址
         server-addr: 10.87.10.54:8848
         # 配置文件格式
@@ -25,6 +25,7 @@ spring:
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+        namespace: 13d6af5d-c288-40d6-b1ee-4fc370665aba
 logging:
   file:
-    name: logs/${spring.application.name}/info.log
+    name: logs/${spring.application.name}/info.log

soc-modules/soc-modules-gen/src/main/resources/bootstrap.yml

@@ -13,11 +13,10 @@ spring:
   cloud:
     nacos:
       discovery:
-        namespace: 34306a91-1bb7-45ce-b80d-4092dd08ea64
         # 服务注册地址
         server-addr: 10.87.10.54:8848
+        namespace: 13d6af5d-c288-40d6-b1ee-4fc370665aba
       config:
-        namespace: 34306a91-1bb7-45ce-b80d-4092dd08ea64
         # 配置中心地址
         server-addr: 10.87.10.54:8848
         # 配置文件格式
@@ -25,3 +24,4 @@ spring:
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+        namespace: 13d6af5d-c288-40d6-b1ee-4fc370665aba

soc-modules/soc-modules-job/src/main/resources/bootstrap.yml

@@ -3,7 +3,7 @@ server:
   port: 9203
 
 # Spring
-spring: 
+spring:
   application:
     # 应用名称
     name: soc-job
@@ -13,11 +13,11 @@ spring:
   cloud:
     nacos:
       discovery:
-        namespace: 34306a91-1bb7-45ce-b80d-4092dd08ea64
+        namespace: 13d6af5d-c288-40d6-b1ee-4fc370665aba
         # 服务注册地址
         server-addr: 10.87.10.54:8848
       config:
-        namespace: 34306a91-1bb7-45ce-b80d-4092dd08ea64
+        namespace: 13d6af5d-c288-40d6-b1ee-4fc370665aba
         # 配置中心地址
         server-addr: 10.87.10.54:8848
         # 配置文件格式
@@ -27,4 +27,4 @@ spring:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
 logging:
   file:
-    name: logs/${spring.application.name}/info.log
+    name: logs/${spring.application.name}/info.log

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

@@ -29,8 +29,7 @@ import java.util.List;
 @Api(tags = {"SysData"})
 @RestController
 @RequestMapping("/dict/data")
-public class SysDictDataController extends BaseController
-{
+public class SysDictDataController extends BaseController {
     @Autowired
     private ISysDictDataService dictDataService;
 
@@ -39,44 +38,47 @@ public class SysDictDataController extends BaseController
 
     @RequiresPermissions("system:dict:list")
     @GetMapping("/list")
-    public TableDataInfo<SysDictData> list(SysDictData dictData)
-    {
+    public TableDataInfo<SysDictData> list(SysDictData dictData) {
         return dictDataService.selectDictDataList(dictData);
     }
 
 
-
     /**
      * 查询字典数据详细
      */
     @RequiresPermissions("system:dict:query")
     @GetMapping(value = "/{dictCode}")
-    public AjaxResult getInfo(@PathVariable Long dictCode)
-    {
+    public AjaxResult getInfo(@PathVariable Long dictCode) {
         return success(dictDataService.selectDictDataById(dictCode));
     }
 
     /**
+     * 根据资产类别查询设备分类
+     */
+    @ApiOperation(value = "根据资产类别查询设备分类")
+    @GetMapping(value = "/deviceType/{assetType}")
+    public AjaxResult deviceType(@PathVariable Integer assetType) {
+        return success(dictTypeService.getDeviceTypeByAssetType(assetType.toString()));
+    }
+
+    /**
      * 根据字典类型查询字典数据信息
      */
     @ApiOperation(value = "根据字典类型查询字典数据信息")
     @GetMapping(value = "/type/{dictType}")
-    public AjaxResult dictType(@PathVariable String dictType)
-    {
+    public AjaxResult dictType(@PathVariable String dictType) {
         List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
-        if (StringUtils.isNull(data))
-        {
+        if (StringUtils.isNull(data)) {
             data = new ArrayList<SysDictData>();
         }
         return success(data);
     }
+
     @ApiOperation(value = "根据字典类型查询字典数据信息")
     @GetMapping(value = "/bytype/{dictType}")
-    public List<SysDictData> dictByType(@PathVariable String dictType)
-    {
+    public List<SysDictData> dictByType(@PathVariable String dictType) {
         List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
-        if (StringUtils.isNull(data))
-        {
+        if (StringUtils.isNull(data)) {
             data = new ArrayList<SysDictData>();
         }
         return data;
@@ -88,8 +90,7 @@ public class SysDictDataController extends BaseController
     @RequiresPermissions("system:dict:add")
     @Log(title = "字典数据", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody SysDictData dict)
-    {
+    public AjaxResult add(@Validated @RequestBody SysDictData dict) {
         dict.setCreateBy(SecurityUtils.getUsername());
         return toAjax(dictDataService.insertDictData(dict));
     }
@@ -100,8 +101,7 @@ public class SysDictDataController extends BaseController
     @RequiresPermissions("system:dict:edit")
     @Log(title = "字典数据", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@Validated @RequestBody SysDictData dict)
-    {
+    public AjaxResult edit(@Validated @RequestBody SysDictData dict) {
         dict.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(dictDataService.updateDictData(dict));
     }
@@ -112,8 +112,7 @@ public class SysDictDataController extends BaseController
     @RequiresPermissions("system:dict:remove")
     @Log(title = "字典类型", businessType = BusinessType.DELETE)
     @DeleteMapping("/{dictCodes}")
-    public AjaxResult remove(@PathVariable Long[] dictCodes)
-    {
+    public AjaxResult remove(@PathVariable Long[] dictCodes) {
         dictDataService.deleteDictDataByIds(dictCodes);
         return success();
     }

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

@@ -23,6 +23,12 @@ public interface SysDictDataMapper extends BaseMapper<SysDictData>
      List<SysDictData> selectDictDataList(SysDictData dictData);
 
     /**
+     * 查询设备类型
+     * @param assetType
+     * @return
+     */
+    List<SysDictData>getDeviceTypeByAssetType(List<String> assetType);
+    /**
      * 根据字典类型查询字典数据
      * 
      * @param dictType 字典类型

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

@@ -36,6 +36,7 @@ public interface SysDictTypeMapper extends BaseMapper<SysDictType>
      */
      SysDictType selectDictTypeById(Long dictId);
 
+
     /**
      * 根据字典类型查询信息
      * 

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

@@ -38,6 +38,12 @@ public interface ISysDictTypeService extends IService<SysDictType>
     List<SysDictData> selectDictDataByType(String dictType);
 
     /**
+     * 通过资产类别查设备分类
+     * @param assetType
+     * @return
+     */
+    List<SysDictData>getDeviceTypeByAssetType(String assetType);
+    /**
      * 根据字典类型ID查询信息
      *
      * @param dictId 字典类型ID

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

@@ -19,6 +19,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.PostConstruct;
+import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
@@ -30,8 +31,7 @@ import java.util.stream.Collectors;
  * @author xunmei
  */
 @Service
-public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDictType> implements ISysDictTypeService
-{
+public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDictType> implements ISysDictTypeService {
     @Autowired
     private SysDictTypeMapper dictTypeMapper;
 
@@ -42,8 +42,7 @@ public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDi
      * 项目启动时，初始化字典到缓存
      */
     @PostConstruct
-    public void init()
-    {
+    public void init() {
         loadingDictCache();
     }
 
@@ -54,18 +53,17 @@ public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDi
      * @return 字典类型集合信息
      */
     @Override
-    public TableDataInfo<SysDictType> selectDictTypeList(SysDictType dictType)
-    {
+    public TableDataInfo<SysDictType> selectDictTypeList(SysDictType dictType) {
         Page<SysDictType> page;
-        if (dictType.getPageNum() != null &&dictType.getPageSize() != null){
+        if (dictType.getPageNum() != null && dictType.getPageSize() != null) {
             page = new Page<>(dictType.getPageNum(), dictType.getPageSize());
-        }else{
+        } else {
             page = new Page<>();
         }
         QueryWrapper<SysDictType> where = new QueryWrapper<>(dictType);
         //模糊查询
-        if (StringUtils.isNotNull(dictType.getDictName())){
-            where.like("dict_name",dictType.getDictName());
+        if (StringUtils.isNotNull(dictType.getDictName())) {
+            where.like("dict_name", dictType.getDictName());
             dictType.setDictName(null);
         }
         Page<SysDictType> list = dictTypeMapper.selectPage(page, where);
@@ -79,8 +77,7 @@ public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDi
      * @return 字典类型集合信息
      */
     @Override
-    public List<SysDictType> selectDictTypeAll()
-    {
+    public List<SysDictType> selectDictTypeAll() {
         return dictTypeMapper.selectDictTypeAll();
     }
 
@@ -91,22 +88,35 @@ public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDi
      * @return 字典数据集合信息
      */
     @Override
-    public List<SysDictData> selectDictDataByType(String dictType)
-    {
+    public List<SysDictData> selectDictDataByType(String dictType) {
         List<SysDictData> dictDatas = DictUtils.getDictCache(dictType);
-        if (StringUtils.isNotEmpty(dictDatas))
-        {
+        if (StringUtils.isNotEmpty(dictDatas)) {
             return dictDatas;
         }
         dictDatas = dictDataMapper.selectDictDataByType(dictType);
-        if (StringUtils.isNotEmpty(dictDatas))
-        {
+        if (StringUtils.isNotEmpty(dictDatas)) {
             DictUtils.setDictCache(dictType, dictDatas);
             return dictDatas;
         }
         return null;
     }
 
+    @Override
+    public List<SysDictData> getDeviceTypeByAssetType(String assetType) {
+        List<String> v = new ArrayList<>();
+        List<SysDictData> deviceTypeByAssetType = new ArrayList<>();
+        if (assetType.equals("0")) {
+            v.add("3");
+            v.add("4");
+        } else {
+            v.add("0");
+            v.add("1");
+            v.add("2");
+        }
+        deviceTypeByAssetType = dictDataMapper.getDeviceTypeByAssetType(v);
+        return deviceTypeByAssetType;
+    }
+
     /**
      * 根据字典类型ID查询信息
      *
@@ -114,8 +124,7 @@ public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDi
      * @return 字典类型
      */
     @Override
-    public SysDictType selectDictTypeById(Long dictId)
-    {
+    public SysDictType selectDictTypeById(Long dictId) {
         return dictTypeMapper.selectDictTypeById(dictId);
     }
 
@@ -126,8 +135,7 @@ public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDi
      * @return 字典类型
      */
     @Override
-    public SysDictType selectDictTypeByType(String dictType)
-    {
+    public SysDictType selectDictTypeByType(String dictType) {
         return dictTypeMapper.selectDictTypeByType(dictType);
     }
 
@@ -137,13 +145,10 @@ public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDi
      * @param dictIds 需要删除的字典ID
      */
     @Override
-    public void deleteDictTypeByIds(Long[] dictIds)
-    {
-        for (Long dictId : dictIds)
-        {
+    public void deleteDictTypeByIds(Long[] dictIds) {
+        for (Long dictId : dictIds) {
             SysDictType dictType = selectDictTypeById(dictId);
-            if (dictDataMapper.countDictDataByType(dictType.getDictType()) > 0)
-            {
+            if (dictDataMapper.countDictDataByType(dictType.getDictType()) > 0) {
                 throw new ServiceException(String.format("%1$s已分配,不能删除", dictType.getDictName()));
             }
             dictTypeMapper.deleteDictTypeById(dictId);
@@ -155,13 +160,11 @@ public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDi
      * 加载字典缓存数据
      */
     @Override
-    public void loadingDictCache()
-    {
+    public void loadingDictCache() {
         SysDictData dictData = new SysDictData();
         dictData.setStatus("0");
         Map<String, List<SysDictData>> dictDataMap = dictDataMapper.selectDictDataList(dictData).stream().collect(Collectors.groupingBy(SysDictData::getDictType));
-        for (Map.Entry<String, List<SysDictData>> entry : dictDataMap.entrySet())
-        {
+        for (Map.Entry<String, List<SysDictData>> entry : dictDataMap.entrySet()) {
             DictUtils.setDictCache(entry.getKey(), entry.getValue().stream().sorted(Comparator.comparing(SysDictData::getDictSort)).collect(Collectors.toList()));
         }
     }
@@ -170,8 +173,7 @@ public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDi
      * 清空字典缓存数据
      */
     @Override
-    public void clearDictCache()
-    {
+    public void clearDictCache() {
         DictUtils.clearDictCache();
     }
 
@@ -179,8 +181,7 @@ public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDi
      * 重置字典缓存数据
      */
     @Override
-    public void resetDictCache()
-    {
+    public void resetDictCache() {
         clearDictCache();
         loadingDictCache();
     }
@@ -192,11 +193,9 @@ public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDi
      * @return 结果
      */
     @Override
-    public int insertDictType(SysDictType dict)
-    {
+    public int insertDictType(SysDictType dict) {
         int row = dictTypeMapper.insertDictType(dict);
-        if (row > 0)
-        {
+        if (row > 0) {
             DictUtils.setDictCache(dict.getDictType(), null);
         }
         return row;
@@ -210,13 +209,11 @@ public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDi
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public int updateDictType(SysDictType dict)
-    {
+    public int updateDictType(SysDictType dict) {
         SysDictType oldDict = dictTypeMapper.selectDictTypeById(dict.getDictId());
         dictDataMapper.updateDictDataType(oldDict.getDictType(), dict.getDictType());
         int row = dictTypeMapper.updateDictType(dict);
-        if (row > 0)
-        {
+        if (row > 0) {
             List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(dict.getDictType());
             DictUtils.setDictCache(dict.getDictType(), dictDatas);
         }
@@ -230,12 +227,10 @@ public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDi
      * @return 结果
      */
     @Override
-    public boolean checkDictTypeUnique(SysDictType dict)
-    {
+    public boolean checkDictTypeUnique(SysDictType dict) {
         Long dictId = StringUtils.isNull(dict.getDictId()) ? -1L : dict.getDictId();
         SysDictType dictType = dictTypeMapper.checkDictTypeUnique(dict.getDictType());
-        if (StringUtils.isNotNull(dictType) && dictType.getDictId().longValue() != dictId.longValue())
-        {
+        if (StringUtils.isNotNull(dictType) && dictType.getDictId().longValue() != dictId.longValue()) {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;

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

@@ -165,7 +165,7 @@ public class SysNfcBindServiceImpl extends ServiceImpl<SysNfcBindMapper, SysNfcB
         queryWrapper.eq("del_flag", 0);
         queryWrapper.eq("code", sysNfcBind.getCode());
         SysNfcBind sysNfcBind1 = baseMapper.selectOne(queryWrapper);
-        if (null!=sysNfcBind1&&sysNfcBind1.getId()!=sysNfcBind.getId()) {
+        if (null!=sysNfcBind1&&(!sysNfcBind1.getId().equals(sysNfcBind.getId()))) {
             throw new ServiceException("已存在，请勿重复修改");
         }
         sysNfcBind.setUpdateTime(DateUtils.getNowDate());

soc-modules/soc-modules-system/src/main/resources/bootstrap.yml

@@ -13,18 +13,19 @@ spring:
   cloud:
     nacos:
       discovery:
-        namespace: 083dc0cf-7829-4914-9d5c-d48f1a31015d
+        namespace: 13d6af5d-c288-40d6-b1ee-4fc370665aba
         # 服务注册地址
         server-addr: 10.87.10.54:8848
       config:
-        namespace: 083dc0cf-7829-4914-9d5c-d48f1a31015d
         # 配置中心地址
         server-addr: 10.87.10.54:8848
         # 配置文件格式
         file-extension: yml
+
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+        namespace: 13d6af5d-c288-40d6-b1ee-4fc370665aba
 logging:
   file:
     name: logs/${spring.application.name}/info.log

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

@@ -59,7 +59,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="countDictDataByType" resultType="Integer">
 	    select count(1) from sys_dict_data where dict_type=#{dictType}  
 	</select>
-	
+	<select id="getDeviceTypeByAssetType" resultType="com.xunmei.system.api.domain.SysDictData">
+		SELECT
+			*
+		FROM
+			sys_dict_data
+		WHERE
+			dict_type = 'sys_device_type'
+		  AND dict_value IN
+		<foreach collection="list" index="index" item="item" open="(" separator="," close=")">
+			#{item}
+		</foreach>
+	</select>
+
 	<delete id="deleteDictDataById" parameterType="Long">
  		delete from sys_dict_data where dict_code = #{dictCode}
  	</delete>