添加样表设备列表

sample-form-manager/db/menu.sql

@@ -12,3 +12,6 @@ INSERT INTO `mortals_xhx_resource` VALUES (null, '事项材料公共库-菜单
 -- ----------------------------
 -- 事项材料公共库参数 SQL
 -- ----------------------------
+
+
+INSERT INTO `mortals_xhx_task` (`id`, `name`, `taskKey`, `status`, `excuteService`, `excuteParam`, `excuteHost`, `excuteStrategy`, `excuteDate`, `excuteTime`, `remark`, `lastExcuteHost`, `lastExcuteTime`, `interimExcuteStatus`, `createTime`, `createUserId`, `createUserName`) VALUES ('4', '同步设备', 'SyncSiteDeviceTask', '0', 'SyncSiteDeviceTask', NULL, NULL, '4', '120', '00:00', NULL, '127.0.1.1', '2023-02-26 22:15:59', '0', '2023-02-25 14:34:12', '1', NULL);

sample-form-manager/db/module.sql

@@ -285,5 +285,39 @@ CREATE TABLE `mortals_xhx_device` (
       PRIMARY KEY (`id`) USING BTREE
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COMMENT='设备';
 
+-- ----------------------------
+-- 设备事项申请材料业务表
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_xhx_device_matter_datum`;
+CREATE TABLE mortals_xhx_device_matter_datum(
+    `id` bigint(20)   AUTO_INCREMENT   COMMENT '主键，自增长',
+    `deviceId` bigint(20)      COMMENT '设备id',
+    `deviceCode` varchar(255)      COMMENT '设备编码',
+    `deviceName` varchar(255)      COMMENT '设备名称',
+    `productId` bigint(20)      COMMENT '产品id',
+    `productCode` varchar(255)      COMMENT '产品编码',
+    `productName` varchar(255)      COMMENT '产品名称',
+    `matterId` bigint(20)      COMMENT '事项matter id',
+    `siteId` bigint(20)      COMMENT '站点ID',
+    `deptId` bigint(20)      COMMENT '部门ID',
+    `deptCode` varchar(256)      COMMENT '部门编号',
+    `deptName` varchar(256)      COMMENT '部门名称',
+    `materialName` varchar(1024) NOT NULL     COMMENT '材料名',
+    `materiaFullName` varchar(1024) NOT NULL     COMMENT '材料全名',
+    `source` tinyint(2)      COMMENT '事项来源(0.政务网，1.自定义)',
+    `isRecommend` tinyint(2)      COMMENT '是否推荐(0.未推荐，1.推荐)',
+    `total` int(8)      COMMENT '填单次数',
+    `sort` int(4)      COMMENT '排序',
+    `sampleName` varchar(255)      COMMENT '样表名称',
+    `samplePath` varchar(255)      COMMENT '样表地址',
+    `preViewPath` varchar(255)      COMMENT '样表预览地址',
+    `createTime` datetime      COMMENT '创建时间',
+    `createUserId` bigint(20)      COMMENT '创建用户',
+    `updateTime` datetime      COMMENT '修改时间',
+    PRIMARY KEY  (`id`)
+    ,KEY `deviceCode` (`deviceCode`) USING BTREE
+    ,KEY `siteId` (`siteId`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='设备事项申请材料业务';
+
 
 

sample-form-manager/pom.xml

@@ -380,8 +380,6 @@
                     </execution>
                 </executions>
             </plugin>
-
-
         </plugins>
     </build>
 

sample-form-manager/src/main/java/com/mortals/xhx/base/framework/aspect/OperlogAspect.java

@@ -13,6 +13,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
@@ -35,6 +36,7 @@ public class OperlogAspect extends FileLogServiceImpl   implements ILogService {
     public void doHandlerLog(String platformMark, Long userId, String userName, String loginName, String requestUrl,
             String content, String ip, Date logDate) {
         super.doHandlerLog(platformMark, userId, userName, loginName, requestUrl, content, ip, logDate);
+        if(ObjectUtils.isEmpty(userId)) return;
         operLogService.insertOperLog(ip, requestUrl, userId, userName, loginName, content);
     }
 

sample-form-manager/src/main/java/com/mortals/xhx/common/code/IsRecommendEnum.java

+package com.mortals.xhx.common.code;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+* 是否推荐(0.未推荐，1.推荐)枚举类
+*
+* @author zxfei
+*/
+public enum IsRecommendEnum {
+    未推荐(0, "未推荐"),
+    推荐(1, "推荐");
+    private Integer value;
+    private String desc;
+
+    IsRecommendEnum(Integer value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public Integer getValue() {
+        return this.value;
+    }
+
+    public String getDesc() {
+        return this.desc;
+    }
+
+    public static IsRecommendEnum getByValue(Integer value) {
+        for (IsRecommendEnum isRecommendEnum : IsRecommendEnum.values()) {
+            if (isRecommendEnum.getValue() == value) {
+                return isRecommendEnum;
+            }
+        }
+        return null;
+    }
+
+    /**
+    * 获取Map集合
+    *
+    * @param eItem 不包含项
+    * @return
+    */
+    public static Map<String, String> getEnumMap(Integer... eItem) {
+        Map<String, String> resultMap = new LinkedHashMap<>();
+        for (IsRecommendEnum item : IsRecommendEnum.values()) {
+            try {
+                boolean hasE = false;
+                for (Integer e : eItem) {
+                    if (item.getValue() == e) {
+                        hasE = true;
+                        break;
+                    }
+                }
+                if (!hasE) {
+                    resultMap.put(item.getValue() + "", item.getDesc());
+                }
+            } catch (Exception ex) {
+
+            }
+        }
+        return resultMap;
+    }
+}
\ No newline at end of file

sample-form-manager/src/main/java/com/mortals/xhx/common/code/SourceEnum.java

@@ -4,7 +4,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 /**
-* 事项来源 (0.政务网，1.自定义)枚举类
+* 事项来源(0.政务网，1.自定义)枚举类
 *
 * @author zxfei
 */

sample-form-manager/src/main/java/com/mortals/xhx/module/device/dao/DeviceMatterDatumDao.java

+package com.mortals.xhx.module.device.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.device.model.DeviceMatterDatumEntity;
+import java.util.List;
+/**
+* 设备事项申请材料业务Dao
+* 设备事项申请材料业务 DAO接口
+*
+* @author zxfei
+* @date 2023-02-25
+*/
+
+public interface  DeviceMatterDatumDao extends ICRUDDao<DeviceMatterDatumEntity,Long>{
+
+
+}

sample-form-manager/src/main/java/com/mortals/xhx/module/device/dao/ibatis/DeviceMatterDatumDaoImpl.java

+package com.mortals.xhx.module.device.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.device.dao.DeviceMatterDatumDao;
+import com.mortals.xhx.module.device.model.DeviceMatterDatumEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 设备事项申请材料业务DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2023-02-25
+*/
+@Repository("deviceMatterDatumDao")
+public class DeviceMatterDatumDaoImpl extends BaseCRUDDaoMybatis<DeviceMatterDatumEntity,Long> implements DeviceMatterDatumDao {
+
+
+
+}

sample-form-manager/src/main/java/com/mortals/xhx/module/device/model/vo/DeviceMatterDatumVo.java

+package com.mortals.xhx.module.device.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.device.model.DeviceMatterDatumEntity;
+import java.util.ArrayList;
+import java.util.List;
+/**
+* 设备事项申请材料业务视图对象
+*
+* @author zxfei
+* @date 2023-02-25
+*/
+public class DeviceMatterDatumVo extends BaseEntityLong {
+
+}
\ No newline at end of file

sample-form-manager/src/main/java/com/mortals/xhx/module/device/service/DeviceMatterDatumService.java

+package com.mortals.xhx.module.device.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.device.model.DeviceMatterDatumEntity;
+/**
+* DeviceMatterDatumService
+*
+* 设备事项申请材料业务 service接口
+*
+* @author zxfei
+* @date 2023-02-25
+*/
+public interface DeviceMatterDatumService extends ICRUDService<DeviceMatterDatumEntity,Long>{
+
+}
\ No newline at end of file

sample-form-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceMatterDatumServiceImpl.java

+package com.mortals.xhx.module.device.service.impl;
+import org.springframework.stereotype.Service;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
+import com.mortals.xhx.module.device.dao.DeviceMatterDatumDao;
+import com.mortals.xhx.module.device.model.DeviceMatterDatumEntity;
+import com.mortals.xhx.module.device.service.DeviceMatterDatumService;
+/**
+* DeviceMatterDatumService
+* 设备事项申请材料业务 service实现
+*
+* @author zxfei
+* @date 2023-02-25
+*/
+@Service("deviceMatterDatumService")
+public class DeviceMatterDatumServiceImpl extends AbstractCRUDServiceImpl<DeviceMatterDatumDao, DeviceMatterDatumEntity, Long> implements DeviceMatterDatumService {
+    
+}
\ No newline at end of file

sample-form-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceMatterDatumController.java

+package com.mortals.xhx.module.device.web;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.base.system.param.service.ParamService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import com.mortals.framework.model.Context;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.module.device.model.DeviceMatterDatumEntity;
+import com.mortals.xhx.module.device.service.DeviceMatterDatumService;
+import org.apache.commons.lang3.ArrayUtils;
+import com.mortals.framework.util.StringUtils;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import com.alibaba.fastjson.JSONObject;
+import java.util.Arrays;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import static com.mortals.framework.ap.SysConstains.*;
+/**
+*
+* 设备事项申请材料业务
+*
+* @author zxfei
+* @date 2023-02-25
+*/
+@RestController
+@RequestMapping("device/matter/datum")
+public class DeviceMatterDatumController extends BaseCRUDJsonBodyMappingController<DeviceMatterDatumService,DeviceMatterDatumEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public DeviceMatterDatumController(){
+        super.setModuleDesc( "设备事项申请材料业务");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        this.addDict(model, "source", paramService.getParamBySecondOrganize("DeviceMatterDatum","source"));
+        this.addDict(model, "isRecommend", paramService.getParamBySecondOrganize("DeviceMatterDatum","isRecommend"));
+        super.init(model, context);
+    }
+
+
+}
\ No newline at end of file

sample-form-manager/src/main/resources/bootstrap.yml

 server:
   tomcat:
     uri-encoding: utf-8
+  port: @profiles.server.port@
+  servlet:
+    context-path: @profiles.server.path@
 spring:
   application:
     name: @project.artifactId@
@@ -35,13 +38,6 @@ application:
   auth:
     unloginUrl: /refresh,/error,/login/login,/login/index,/login/logout,/customer/login/login,/customer/login/logout,/securitycode/createCode,/customer/trial/save,/file/common/*,/file/preview/*,/test*,/api/asset/*,/api/*,/zwfw/*,/ws/*,/swagger-ui*,/topic/*,/uploads/*
     uncheckUrl: /refresh,/error,/login/login,/login/index,/login/logout,/customer/login/login,/customer/login/logout,/securitycode/createCode,/customer/trial/save,/file/common/*,/file/preview/*,/test*,/api/asset/*,/api/*,/zwfw/*,/ws/*,/swagger-ui*,/topic/*,/uploads/*
-  workflow:
-    tenantId: ${spring.application.name}
-cookie:
-  ssoServerUrl: http://sso.testnew.com
-  key: 026db82420614469897fcc2dc1b4ce38
-  domain: base.testnew.com
-  port: 111
 token:
   head: mortal
 hystrix:

sample-form-manager/src/test/java/com/mortals/httpclient/device/DeviceMatterDatumController.http

+###登录
+POST {{baseUrl}}/login/login
+Content-Type: application/json
+
+{
+"loginName":"admin",
+"password":"admin",
+"securityCode":"8888"
+}
+
+> {%
+client.global.set("SmsSet_id", JSON.parse(response.body).data.id);
+client.global.set("authToken", JSON.parse(response.body).data.token);
+%}
+
+###设备事项申请材料业务列表
+POST {{baseUrl}}/device/matter/datum/list
+Authorization: {{authToken}}
+Content-Type: application/json
+
+{
+    "deviceCode":"ayeliw",
+    "siteId":969,
+    "page":1,
+    "size":10
+}
+
+
+###设备事项申请材料业务更新与保存
+POST {{baseUrl}}/device/matter/datum/save
+Authorization: {{authToken}}
+Content-Type: application/json
+
+{
+        "deviceId":774,
+        "deviceCode":"cq4ted",
+        "deviceName":"ivgx2j",
+        "productId":60,
+        "productCode":"r76xdx",
+        "productName":"l3ojgr",
+        "matterId":487,
+        "siteId":572,
+        "deptId":798,
+        "deptCode":"tpqg1i",
+        "deptName":"bpo2fi",
+        "materialName":"9na5yj",
+        "materiaFullName":"jf6xja",
+        "source":741,
+        "isRecommend":229,
+        "total":720,
+        "sort":851,
+        "sampleName":"zl9yi4",
+        "samplePath":"qu0r4t",
+        "preViewPath":"jq065d",
+}
+
+> {%
+client.global.set("DeviceMatterDatum_id", JSON.parse(response.body).data.id);
+%}
+
+###设备事项申请材料业务查看
+GET {{baseUrl}}/device/matter/datum/info?id={{DeviceMatterDatum_id}}
+Authorization: {{authToken}}
+Accept: application/json
+
+###设备事项申请材料业务编辑
+GET {{baseUrl}}/device/matter/datum/edit?id={{DeviceMatterDatum_id}}
+Authorization: {{authToken}}
+Accept: application/json
+
+
+###设备事项申请材料业务删除
+GET {{baseUrl}}/device/matter/datum/delete?id={{DeviceMatterDatum_id}}
+Authorization: {{authToken}}
+Accept: application/json
+
+
+
+