Merge remote-tracking branch 'origin/master'

.gitignore

@@ -27,7 +27,7 @@ target/
 
 /target/
 *.class
-*.jar
+# *.jar
 *.log
 *.zip
 /logs/*

ArcFace64.dat

+EWEPEPEOGMGTELIZJUGECKIUJDBCJTCNISGPBNHLJTJUBHEWGNAKGEGAIOHJDQAJGNCFDRFZJEDMJTIHCSIFAADFBNCKFPIAIYHDDNHPFDJQIJJMGEEJGDJDFOGJCSHDIRJFBGBVDVDJDNFLFWHHJHBKDYDREHBNGCDKJVELFZIZJABAICFCIDFLIYEFJDGCIMEVIHHCEAGMAVHRBTACDPBMCBCZBKHFIHDTAXCMJDICIKGRHZAHFDECHKHVHIEBCTAQATJEESFBFUDCJKIBDRCCAIDSHJDSAZJFCNGKAGHRHBJUAKFUALDJGUFXHVFBAPILFIAOEUGWHNDRHMHNJRFPITGQFSEWACDXCJIXDFIMAVBUGLISCYGOCYJBCFAUCYHAGCGLIPJRAPHUGJHQCSCTHDICBOARCADZCGJRDVAZIZFWFWHDEVFCJQGVHWDVHCIEJNCRDVJCBWEZBPGGHVAZIQHBENCUEQCXHBCFDIGYGZHDCFBGISAYBYAIEFEJETHPABITGCDRHGCAEVIBHPGFCFFSCZCDDKFCDECPHXIBGIHNEZAWEZFCDJEJJIBQEYDRBGDWJQFDGKHWBEBLEKCOIDBHDRAXGJHZJCGQIVHNFICVHLFEBBCMBQCVGLCLGVHZDHJSGUEKAWAYDPCMGDFSDUDLDFGAHNETDTIHENCIFWCHGDGRGQDRAXDPGTHFBEATBGFRBZGTIHGJJTBNEHGMBWGICFCREDIQIKEDBNGTDIDJIPIZBZFDHJCAIVDIATJFHXCYFVCGEVAHHAEVEXDWFLCPHQCRDCDEIIJRFBENAWFJFEHOHCBWEAFKERGSFGFHAVEOFIBODLEWBHDCGMJUIPFOETJTCTDXJGFVCQGJAQDREIEUIRBECCAVIPJGEXALIXFLGDJCEIIZIWAUBPEXBUDEENIMBUBBCOHRIYIMJBAEGQHDCYBKHZJDEUJMCPENIJDVIQELFHIPGDHXBWDDADHZFPFDDTFACVCBIFHYBVCCFLFQJLBWATIIHUDNJMGKDEGCJRHAFTEPGQGLCDCZGNCOEYBBFABMFWCRDFGXCKAMAVCNBJHAIXGEGLERCDDCHDERAGHYJCCBGAJNFVFBGNHQDMHRFJBDEEJOEOBMIVGWDEDMAGECBUICFQHQFAGSELDMJADIEZHFBAFLJUCHGRIAGBDYJLHHGXHSGBIXHJ
\ No newline at end of file

danger-manage-admin/pom.xml

@@ -66,6 +66,16 @@
             <artifactId>artemis-http-client</artifactId>
             <version>1.1.3</version>
         </dependency>
+
+        <!--虹软 -->
+        <dependency>
+            <groupId>arcsoft</groupId>
+            <artifactId>arcsoft-sdk-face</artifactId>
+            <version>3.0.0.0</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/arcsoft_lib/arcsoft-sdk-face-3.0.0.0.jar</systemPath>
+        </dependency>
+
     </dependencies>
 
     <build>
@@ -132,6 +142,7 @@
                             </resources>
                         </configuration>
                     </execution>
+
                     <execution>
                         <id>copy-sh</id>
                         <phase>package</phase>
@@ -152,6 +163,29 @@
                             </resources>
                         </configuration>
                     </execution>
+
+                    <execution>
+                        <id>copy-arcsoft-lib</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <encoding>UTF-8</encoding>
+                            <outputDirectory>${project.build.directory}/danger-manage-${project.version}/arcsoft_lib</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>arcsoft_lib</directory>
+                                    <excludes>
+                                        <exclude>
+                                            *.jar
+                                        </exclude>
+                                    </excludes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+
                     <execution>
                         <id>copy-dist-jar</id>
                         <phase>package</phase>

danger-manage-admin/src/main/java/com/zehong/web/arcface/factory/FaceEngineFactory.java

+package com.zehong.web.arcface.factory;
+
+import com.arcsoft.face.EngineConfiguration;
+import com.arcsoft.face.FaceEngine;
+import com.arcsoft.face.enums.ErrorInfo;
+import org.apache.commons.pool2.BasePooledObjectFactory;
+import org.apache.commons.pool2.PooledObject;
+import org.apache.commons.pool2.impl.DefaultPooledObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * @author geng
+ * 人脸识别引擎初始化
+ */
+public class FaceEngineFactory extends BasePooledObjectFactory<FaceEngine> {
+
+    private static final Logger logger = LoggerFactory.getLogger(FaceEngineFactory.class);
+
+    private String appId;
+    private String sdkKey;
+    private String sdkLibPath;
+    private EngineConfiguration engineConfiguration;
+
+
+    public FaceEngineFactory(String sdkLibPath, String appId, String sdkKey, EngineConfiguration engineConfiguration) {
+        this.sdkLibPath = sdkLibPath;
+        this.appId = appId;
+        this.sdkKey = sdkKey;
+        this.engineConfiguration = engineConfiguration;
+
+    }
+
+
+    @Override
+    public FaceEngine create() throws Exception {
+
+        FaceEngine faceEngine = new FaceEngine(System.getProperty("user.dir") + sdkLibPath);
+        int activeCode = faceEngine.activeOnline(appId, sdkKey);
+        logger.info("faceEngineActiveCode:" + activeCode + "==========================");
+        if (activeCode != ErrorInfo.MOK.getValue() && activeCode != ErrorInfo.MERR_ASF_ALREADY_ACTIVATED.getValue()) {
+            logger.error("引擎激活失败" + activeCode);
+            throw new Exception("引擎激活失败" + activeCode);
+        }
+        int initCode = faceEngine.init(engineConfiguration);
+        logger.info("faceEngineInitCode:" + initCode + "==========================");
+        if (initCode != ErrorInfo.MOK.getValue()) {
+            logger.error("引擎初始化失败" + initCode);
+            throw new Exception( "引擎初始化失败" + initCode);
+        }
+        return faceEngine;
+    }
+
+    @Override
+    public PooledObject<FaceEngine> wrap(FaceEngine faceEngine) {
+        return new DefaultPooledObject<>(faceEngine);
+    }
+
+
+    @Override
+    public void destroyObject(PooledObject<FaceEngine> p) throws Exception {
+        FaceEngine faceEngine = p.getObject();
+        int unInitCode = faceEngine.unInit();
+        logger.info("faceEngineUnInitCode:" + unInitCode + "==========================");
+        super.destroyObject(p);
+    }
+}

danger-manage-admin/src/main/java/com/zehong/web/arcface/util/FaceEngineUtils.java

+package com.zehong.web.arcface.util;
+
+import com.arcsoft.face.*;
+import com.arcsoft.face.enums.DetectMode;
+import com.arcsoft.face.enums.DetectOrient;
+import com.arcsoft.face.toolkit.ImageInfo;
+import com.zehong.web.arcface.factory.FaceEngineFactory;
+import org.apache.commons.pool2.impl.GenericObjectPool;
+import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
+import javax.annotation.PostConstruct;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author geng
+ * 人脸比对
+ */
+@Component
+public class FaceEngineUtils {
+
+    private static final Logger logger = LoggerFactory.getLogger(FaceEngineUtils.class);
+
+    @Value("${config.arcface-sdk.sdk-lib-path}")
+    public String sdkLibPath;
+    @Value("${config.arcface-sdk.app-id}")
+    public String appId;
+    @Value("${config.arcface-sdk.sdk-key}")
+    public String sdkKey;
+    @Value("${config.arcface-sdk.detect-face-max-num}")
+    public Integer detectFaceMaxNum;
+    @Value("${config.arcface-sdk.detect-face-scale-val}")
+    public Integer detectFaceScaleVal;
+    @Value("${config.arcface-sdk.thread-pool-size}")
+    public Integer threadPoolSize;
+    private GenericObjectPool<FaceEngine> faceEngineGeneralPool;
+
+
+    @PostConstruct
+    public void init() {
+        GenericObjectPoolConfig poolConfig = new GenericObjectPoolConfig();
+        poolConfig.setMaxIdle(threadPoolSize);
+        poolConfig.setMaxTotal(threadPoolSize);
+        poolConfig.setMinIdle(threadPoolSize);
+        poolConfig.setLifo(false);
+
+        //引擎配置
+        EngineConfiguration engineConfiguration = new EngineConfiguration();
+        engineConfiguration.setDetectMode(DetectMode.ASF_DETECT_MODE_IMAGE);
+        engineConfiguration.setDetectFaceOrientPriority(DetectOrient.ASF_OP_0_ONLY);
+        engineConfiguration.setDetectFaceMaxNum(detectFaceMaxNum);
+        engineConfiguration.setDetectFaceScaleVal(detectFaceScaleVal);
+
+        //功能配置
+        FunctionConfiguration functionConfiguration = new FunctionConfiguration();
+        functionConfiguration.setSupportFaceDetect(true);
+        functionConfiguration.setSupportFaceRecognition(true);
+        engineConfiguration.setFunctionConfiguration(functionConfiguration);
+        //底层库算法对象池
+        faceEngineGeneralPool = new GenericObjectPool(new FaceEngineFactory(sdkLibPath, appId, sdkKey, engineConfiguration), poolConfig);
+
+    }
+
+    /**
+     * 人脸识别
+     * @param imageInfo 人脸信息
+     * @return List<FaceInfo>
+     */
+    public List<FaceInfo> detectFaces(ImageInfo imageInfo) {
+
+        FaceEngine faceEngine = null;
+        try {
+            faceEngine = faceEngineGeneralPool.borrowObject();
+            if (faceEngine == null) {
+                throw new Exception("获取引擎失败");
+            }
+
+            //人脸检测得到人脸列表
+            List<FaceInfo> faceInfoList = new ArrayList<>();
+            //人脸检测
+            int errorCode = faceEngine.detectFaces(imageInfo.getImageData(), imageInfo.getWidth(), imageInfo.getHeight(), imageInfo.getImageFormat(), faceInfoList);
+            if (errorCode == 0) {
+                return faceInfoList;
+            } else {
+                logger.error("人脸检测失败，errorCode：" + errorCode);
+            }
+
+        } catch (Exception e) {
+            logger.error("人脸识别系统错误：", e);
+        } finally {
+            if (faceEngine != null) {
+                //释放引擎对象
+                faceEngineGeneralPool.returnObject(faceEngine);
+            }
+        }
+
+        return null;
+
+    }
+
+    /**
+     * 人脸比对
+     * @param imageInfo1 待比对图片
+     * @param imageInfo2 比对图片
+     * @return Integer
+     */
+    public Integer compareFace(ImageInfo imageInfo1, ImageInfo imageInfo2) throws Exception {
+        List<FaceInfo> faceInfoList1 = detectFaces(imageInfo1);
+        List<FaceInfo> faceInfoList2 = detectFaces(imageInfo2);
+
+        if (CollectionUtils.isEmpty(faceInfoList1)) {
+            throw new Exception("照片1未检测到人脸");
+        }
+        if (CollectionUtils.isEmpty(faceInfoList2)) {
+            throw new Exception("照片2未检测到人脸");
+        }
+
+        byte[] feature1 = extractFaceFeature(imageInfo1, faceInfoList1.get(0));
+        byte[] feature2 = extractFaceFeature(imageInfo2, faceInfoList2.get(0));
+
+        FaceEngine faceEngine = null;
+        try {
+            faceEngine = faceEngineGeneralPool.borrowObject();
+            if (faceEngine == null) {
+                throw new Exception("获取引擎失败");
+            }
+
+            FaceFeature faceFeature1 = new FaceFeature();
+            faceFeature1.setFeatureData(feature1);
+            FaceFeature faceFeature2 = new FaceFeature();
+            faceFeature2.setFeatureData(feature2);
+            //提取人脸特征
+            FaceSimilar faceSimilar = new FaceSimilar();
+            int errorCode = faceEngine.compareFaceFeature(faceFeature1, faceFeature2, faceSimilar);
+            if (errorCode == 0) {
+                return plusHundred(faceSimilar.getScore());
+            } else {
+                logger.error("特征提取失败，errorCode：" + errorCode);
+            }
+
+        } catch (Exception e) {
+            logger.error("人脸比对系统错误：", e);
+        } finally {
+            if (faceEngine != null) {
+                //释放引擎对象
+                faceEngineGeneralPool.returnObject(faceEngine);
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * 人脸特征
+     * @param imageInfo 图片信息
+     * @return byte[]
+     */
+    public byte[] extractFaceFeature(ImageInfo imageInfo, FaceInfo faceInfo) {
+
+        FaceEngine faceEngine = null;
+        try {
+            faceEngine = faceEngineGeneralPool.borrowObject();
+            if (faceEngine == null) {
+                throw new Exception("获取引擎失败");
+            }
+            FaceFeature faceFeature = new FaceFeature();
+            //提取人脸特征
+            int errorCode = faceEngine.extractFaceFeature(imageInfo.getImageData(), imageInfo.getWidth(), imageInfo.getHeight(), imageInfo.getImageFormat(), faceInfo, faceFeature);
+            if (errorCode == 0) {
+                return faceFeature.getFeatureData();
+            } else {
+                logger.error("特征提取失败，errorCode：" + errorCode);
+            }
+
+        } catch (Exception e) {
+            logger.error("人脸特征系统错误：", e);
+        } finally {
+            if (faceEngine != null) {
+                //释放引擎对象
+                faceEngineGeneralPool.returnObject(faceEngine);
+            }
+        }
+
+        return null;
+
+    }
+
+    /**
+     * 百分比转化
+     * @param value 相似度
+     * @return int
+     */
+    private int plusHundred(Float value) {
+        BigDecimal target = new BigDecimal(value);
+        BigDecimal hundred = new BigDecimal(100f);
+        return target.multiply(hundred).intValue();
+
+    }
+}

danger-manage-admin/src/main/java/com/zehong/web/controller/arcfacecompare/FaceCompareController.java

+package com.zehong.web.controller.arcfacecompare;
+
+import com.arcsoft.face.toolkit.ImageFactory;
+import com.arcsoft.face.toolkit.ImageInfo;
+import com.zehong.web.arcface.util.FaceEngineUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author geng
+ * 人脸识别
+ */
+@RestController
+@RequestMapping("/arcFace")
+public class FaceCompareController {
+    private static final Logger logger = LoggerFactory.getLogger(FaceCompareController.class);
+
+    @Autowired
+    private FaceEngineUtils faceEngineUtil;
+
+    /**
+     * 图片比对
+     * @param file 待比对图片
+     * @param compareFile 比对图片
+     * @return Integer
+     */
+    @PostMapping(value = "/compare")
+    public Map<String,Object> compare(@RequestParam(value = "file")MultipartFile file, @RequestParam(value = "compareFile")MultipartFile compareFile){
+        Map<String,Object> result = new HashMap<>(16);
+        try {
+            ImageInfo rgbData1 = ImageFactory.getRGBData(file.getBytes());
+            ImageInfo rgbData2 = ImageFactory.getRGBData(compareFile.getBytes());
+            result.put("code","0");
+            result.put("faceSimilar",faceEngineUtil.compareFace(rgbData1,rgbData2));
+            return result;
+        } catch (Exception e) {
+            result.put("code","1");
+            result.put("msg",e.getMessage());
+            logger.error("图片比对系统错误：" + e);
+            return result;
+        }
+    }
+}

danger-manage-admin/src/main/java/com/zehong/web/controller/deviceManagement/TDeviceInfoController.java

@@ -60,6 +60,7 @@ public class TDeviceInfoController extends BaseController
     public AjaxResult listSpecial(TDeviceInfo tDeviceInfo)
     {
         tDeviceInfo.setIsSpecial("1");
+        tDeviceInfo.setIsCancel("0");
         List<TDeviceInfo> list = tDeviceInfoService.selectTDeviceInfoList(tDeviceInfo);
         return AjaxResult.success(list);
     }

danger-manage-admin/src/main/java/com/zehong/web/controller/system/TTrainCourseBankController.java

+package com.zehong.web.controller.system;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zehong.common.annotation.Log;
+import com.zehong.common.core.controller.BaseController;
+import com.zehong.common.core.domain.AjaxResult;
+import com.zehong.common.enums.BusinessType;
+import com.zehong.system.domain.TTrainCourseBank;
+import com.zehong.system.service.ITTrainCourseBankService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * bankController
+ *
+ * @author zehong
+ * @date 2022-12-14
+ */
+@RestController
+@RequestMapping("/system/bank")
+public class TTrainCourseBankController extends BaseController
+{
+    @Autowired
+    private ITTrainCourseBankService tTrainCourseBankService;
+
+    /**
+     * 查询bank列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:bank:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TTrainCourseBank tTrainCourseBank)
+    {
+        startPage();
+        List<TTrainCourseBank> list = tTrainCourseBankService.selectTTrainCourseBankList(tTrainCourseBank);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出bank列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:bank:export')")
+    @Log(title = "bank", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TTrainCourseBank tTrainCourseBank)
+    {
+        List<TTrainCourseBank> list = tTrainCourseBankService.selectTTrainCourseBankList(tTrainCourseBank);
+        ExcelUtil<TTrainCourseBank> util = new ExcelUtil<TTrainCourseBank>(TTrainCourseBank.class);
+        return util.exportExcel(list, "bank数据");
+    }
+
+    /**
+     * 获取bank详细信息
+     */
+    //@PreAuthorize("@ss.hasPermi('system:bank:query')")
+    @GetMapping(value = "/{bankId}")
+    public AjaxResult getInfo(@PathVariable("bankId") Long bankId)
+    {
+        return AjaxResult.success(tTrainCourseBankService.selectTTrainCourseBankById(bankId));
+    }
+
+    /**
+     * 新增bank
+     */
+    //@PreAuthorize("@ss.hasPermi('system:bank:add')")
+    @Log(title = "bank", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TTrainCourseBank tTrainCourseBank)
+    {
+        return toAjax(tTrainCourseBankService.insertTTrainCourseBank(tTrainCourseBank));
+    }
+
+    /**
+     * 修改bank
+     */
+    //@PreAuthorize("@ss.hasPermi('system:bank:edit')")
+    @Log(title = "bank", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TTrainCourseBank tTrainCourseBank)
+    {
+        return toAjax(tTrainCourseBankService.updateTTrainCourseBank(tTrainCourseBank));
+    }
+
+    /**
+     * 删除bank
+     */
+    //@PreAuthorize("@ss.hasPermi('system:bank:remove')")
+    @Log(title = "bank", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{bankIds}")
+    public AjaxResult remove(@PathVariable Long[] bankIds)
+    {
+        return toAjax(tTrainCourseBankService.deleteTTrainCourseBankByIds(bankIds));
+    }
+}

danger-manage-admin/src/main/resources/application-dev.yml

@@ -109,4 +109,15 @@ zehong:
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证
-  captchaType: math
+  captchaType:
\ No newline at end of file
+
+#虹软人脸识别配置（windows配置）
+config:
+  arcface-sdk:
+     #算法引擎路径 示例（Windows配置\danger-manage-admin\arcsoft_lib\WIN64，Linux配置/arcsoft_lib/LINUX64）
+     sdk-lib-path: \danger-manage-admin\arcsoft_lib\WIN64
+     app-id: C8vzXcY8iD7yGFCHweh1QcvJaV684GCPk2oCe4JC1rpZ
+     sdk-key: C8MFKCRxMAsBSDG5W5cL1x1YirGREoojZvFtBzKv3bAP
+     detect-face-max-num: 10
+     detect-face-scale-val: 32
+     thread-pool-size: 5
\ No newline at end of file

danger-manage-admin/src/main/resources/application-prd.yml

@@ -21,9 +21,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://localhost:33060/danger_manage_area_a?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: root
+                password: zehong_/sjz!D
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
@@ -73,7 +73,7 @@ spring:
     # redis 配置
     redis:
       # 地址
-      host: localhost
+      host: 36.138.181.113
       # 端口，默认为6379
       port: 6379
       # 数据库索引
@@ -109,4 +109,16 @@ zehong:
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证
-  captchaType: math
+  captchaType: math
\ No newline at end of file
+
+
+#虹软人脸识别配置(linux配置)
+config:
+  arcface-sdk:
+     #算法引擎路径 示例（Windows配置\danger-manage-admin\arcsoft_lib\WIN64，Linux配置/arcsoft_lib/LINUX64）
+     sdk-lib-path: /arcsoft_lib/LINUX64
+     app-id: 3ZM3ayaRriUPWzzy29QsqeynFcpmu9zMVXGjBrQ4rPkL
+     sdk-key: J1wqG4VVGJYLe5YYT2hQN3xHSqLEwrZJBBRQmuEXkZqc
+     detect-face-max-num: 10
+     detect-face-scale-val: 32
+     thread-pool-size: 5
\ No newline at end of file

danger-manage-system/src/main/java/com/zehong/system/domain/TDeviceInfo.java

@@ -61,6 +61,10 @@ public class TDeviceInfo extends BaseEntity
     @Excel(name = "备注信息")
     private String remarks;
 
+    /** 是否作废(0正常，1作废) */
+    @Excel(name = "是否作废(0正常，1作废)")
+    private String isCancel;
+
     /** 是否删除(0正常，1删除) */
     private String isDel;
 
@@ -173,4 +177,19 @@ public class TDeviceInfo extends BaseEntity
         return isDel;
     }
 
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+    public String getIsCancel() {
+        return isCancel;
+    }
+
+    public void setIsCancel(String isCancel) {
+        this.isCancel = isCancel;
+    }
 }

danger-manage-system/src/main/java/com/zehong/system/domain/TEmergencyDrill.java

@@ -9,7 +9,7 @@ import com.zehong.common.core.domain.BaseEntity;
 
 /**
  * 应急演练对象 t_emergency_drill
- * 
+ *
  * @author zehong
  * @date 2022-06-29
  */
@@ -61,114 +61,140 @@ public class TEmergencyDrill extends BaseEntity
     @Excel(name = "评估")
     private String assessment;
 
+    /**评价*/
+    private String evaluate;
+
+    /**措施*/
+    private String measures;
+
     /** 删除 0否 1是 */
     private Integer isDel;
 
-    public void setDrillId(Long drillId) 
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getEvaluate() {
+        return evaluate;
+    }
+
+    public void setEvaluate(String evaluate) {
+        this.evaluate = evaluate;
+    }
+
+    public String getMeasures() {
+        return measures;
+    }
+
+    public void setMeasures(String measures) {
+        this.measures = measures;
+    }
+
+    public void setDrillId(Long drillId)
     {
         this.drillId = drillId;
     }
 
-    public Long getDrillId() 
+    public Long getDrillId()
     {
         return drillId;
     }
-    public void setDrillName(String drillName) 
+    public void setDrillName(String drillName)
     {
         this.drillName = drillName;
     }
 
-    public String getDrillName() 
+    public String getDrillName()
     {
         return drillName;
     }
-    public void setDrillAddress(String drillAddress) 
+    public void setDrillAddress(String drillAddress)
     {
         this.drillAddress = drillAddress;
     }
 
-    public String getDrillAddress() 
+    public String getDrillAddress()
     {
         return drillAddress;
     }
-    public void setDrillUnit(String drillUnit) 
+    public void setDrillUnit(String drillUnit)
     {
         this.drillUnit = drillUnit;
     }
 
-    public String getDrillUnit() 
+    public String getDrillUnit()
     {
         return drillUnit;
     }
-    public void setDrillTime(Date drillTime) 
+    public void setDrillTime(Date drillTime)
     {
         this.drillTime = drillTime;
     }
 
-    public Date getDrillTime() 
+    public Date getDrillTime()
     {
         return drillTime;
     }
-    public void setDrillType(Integer drillType) 
+    public void setDrillType(Integer drillType)
     {
         this.drillType = drillType;
     }
 
-    public Integer getDrillType() 
+    public Integer getDrillType()
     {
         return drillType;
     }
-    public void setDrillForm(Integer drillForm) 
+    public void setDrillForm(Integer drillForm)
     {
         this.drillForm = drillForm;
     }
 
-    public Integer getDrillForm() 
+    public Integer getDrillForm()
     {
         return drillForm;
     }
-    public void setDrillObjective(String drillObjective) 
+    public void setDrillObjective(String drillObjective)
     {
         this.drillObjective = drillObjective;
     }
 
-    public String getDrillObjective() 
+    public String getDrillObjective()
     {
         return drillObjective;
     }
-    public void setDrillPeople(String drillPeople) 
+    public void setDrillPeople(String drillPeople)
     {
         this.drillPeople = drillPeople;
     }
 
-    public String getDrillPeople() 
+    public String getDrillPeople()
     {
         return drillPeople;
     }
-    public void setDrillContent(String drillContent) 
+    public void setDrillContent(String drillContent)
     {
         this.drillContent = drillContent;
     }
 
-    public String getDrillContent() 
+    public String getDrillContent()
     {
         return drillContent;
     }
-    public void setAssessment(String assessment) 
+    public void setAssessment(String assessment)
     {
         this.assessment = assessment;
     }
 
-    public String getAssessment() 
+    public String getAssessment()
     {
         return assessment;
     }
-    public void setIsDel(Integer isDel) 
+    public void setIsDel(Integer isDel)
     {
         this.isDel = isDel;
     }
 
-    public Integer getIsDel() 
+    public Integer getIsDel()
     {
         return isDel;
     }

danger-manage-system/src/main/java/com/zehong/system/domain/TEnterpriseInfo.java

@@ -50,6 +50,10 @@ public class TEnterpriseInfo extends BaseEntity
     @Excel(name = "营业期限")
     private String businessTerm;
 
+    /** 值班电话 */
+    @Excel(name = "值班电话")
+    private String dutyPhone;
+
     /** 经度 */
     @Excel(name = "经度")
     private BigDecimal longitude;
@@ -292,6 +296,14 @@ public class TEnterpriseInfo extends BaseEntity
         return remarks;
     }
 
+    public String getDutyPhone() {
+        return dutyPhone;
+    }
+
+    public void setDutyPhone(String dutyPhone) {
+        this.dutyPhone = dutyPhone;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

danger-manage-system/src/main/java/com/zehong/system/domain/TMaterialInfo.java

@@ -9,7 +9,7 @@ import com.zehong.common.core.domain.BaseEntity;
 
 /**
  * 应急物资管理对象 t_material_info
- * 
+ *
  * @author zehong
  * @date 2022-07-01
  */
@@ -69,132 +69,147 @@ public class TMaterialInfo extends BaseEntity
     @Excel(name = "手机号")
     private String phone;
 
+    /**责任部门*/
+    private String deptName;
+
     /** 0未删除 1已删除 */
     private Integer isDelete;
 
-    public void setId(Long id) 
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
+    public void setId(Long id)
     {
         this.id = id;
     }
 
-    public Long getId() 
+    public Long getId()
     {
         return id;
     }
-    public void setMaterialName(String materialName) 
+    public void setMaterialName(String materialName)
     {
         this.materialName = materialName;
     }
 
-    public String getMaterialName() 
+    public String getMaterialName()
     {
         return materialName;
     }
-    public void setMaterialType(Integer materialType) 
+    public void setMaterialType(Integer materialType)
     {
         this.materialType = materialType;
     }
 
-    public Integer getMaterialType() 
+    public Integer getMaterialType()
     {
         return materialType;
     }
-    public void setNum(Integer num) 
+    public void setNum(Integer num)
     {
         this.num = num;
     }
 
-    public Integer getNum() 
+    public Integer getNum()
     {
         return num;
     }
-    public void setPerformance(String performance) 
+    public void setPerformance(String performance)
     {
         this.performance = performance;
     }
 
-    public String getPerformance() 
+    public String getPerformance()
     {
         return performance;
     }
-    public void setPurpose(String purpose) 
+    public void setPurpose(String purpose)
     {
         this.purpose = purpose;
     }
 
-    public String getPurpose() 
+    public String getPurpose()
     {
         return purpose;
     }
-    public void setValidityTime(Date validityTime) 
+    public void setValidityTime(Date validityTime)
     {
         this.validityTime = validityTime;
     }
 
-    public Date getValidityTime() 
+    public Date getValidityTime()
     {
         return validityTime;
     }
-    public void setDeptId(Long deptId) 
+    public void setDeptId(Long deptId)
     {
         this.deptId = deptId;
     }
 
-    public Long getDeptId() 
+    public Long getDeptId()
     {
         return deptId;
     }
-    public void setLongitude(String longitude) 
+    public void setLongitude(String longitude)
     {
         this.longitude = longitude;
     }
 
-    public String getLongitude() 
+    public String getLongitude()
     {
         return longitude;
     }
-    public void setLatitude(String latitude) 
+    public void setLatitude(String latitude)
     {
         this.latitude = latitude;
     }
 
-    public String getLatitude() 
+    public String getLatitude()
     {
         return latitude;
     }
-    public void setAddress(String address) 
+    public void setAddress(String address)
     {
         this.address = address;
     }
 
-    public String getAddress() 
+    public String getAddress()
     {
         return address;
     }
-    public void setContacts(String contacts) 
+    public void setContacts(String contacts)
     {
         this.contacts = contacts;
     }
 
-    public String getContacts() 
+    public String getContacts()
     {
         return contacts;
     }
-    public void setPhone(String phone) 
+    public void setPhone(String phone)
     {
         this.phone = phone;
     }
 
-    public String getPhone() 
+    public String getPhone()
     {
         return phone;
     }
-    public void setIsDelete(Integer isDelete) 
+    public void setIsDelete(Integer isDelete)
     {
         this.isDelete = isDelete;
     }
 
-    public Integer getIsDelete() 
+    public Integer getIsDelete()
     {
         return isDelete;
     }

danger-manage-system/src/main/java/com/zehong/system/domain/TSpecialDeviceRecord.java

@@ -31,6 +31,9 @@ public class TSpecialDeviceRecord extends BaseEntity
     @Excel(name = "设备编号")
     private String deviceCode;
 
+    /** 设备id */
+    private Long deviceId;
+
     /** 登记有效日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "登记有效日期", width = 30, dateFormat = "yyyy-MM-dd")
@@ -71,6 +74,14 @@ public class TSpecialDeviceRecord extends BaseEntity
         return deviceCode;
     }
 
+    public Long getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(Long deviceId) {
+        this.deviceId = deviceId;
+    }
+
     public String getOperateType() {
         return operateType;
     }

danger-manage-system/src/main/java/com/zehong/system/domain/TTrainCourseBank.java

+package com.zehong.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.zehong.common.annotation.Excel;
+import com.zehong.common.core.domain.BaseEntity;
+
+/**
+ * bank对象 t_train_course_bank
+ * 
+ * @author zehong
+ * @date 2022-12-14
+ */
+public class TTrainCourseBank extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+    private Long bankId;
+
+    /** 所属部门 */
+    private Long deptId;
+
+    /** 题库名称 */
+    @Excel(name = "题库名称")
+    private String bankName;
+
+    /** 是否删除 0未删除  1删除 */
+    private Integer isDel;
+
+    public void setBankId(Long bankId) 
+    {
+        this.bankId = bankId;
+    }
+
+    public Long getBankId() 
+    {
+        return bankId;
+    }
+    public void setDeptId(Long deptId) 
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId() 
+    {
+        return deptId;
+    }
+    public void setBankName(String bankName) 
+    {
+        this.bankName = bankName;
+    }
+
+    public String getBankName() 
+    {
+        return bankName;
+    }
+    public void setIsDel(Integer isDel) 
+    {
+        this.isDel = isDel;
+    }
+
+    public Integer getIsDel() 
+    {
+        return isDel;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("bankId", getBankId())
+            .append("deptId", getDeptId())
+            .append("bankName", getBankName())
+            .append("isDel", getIsDel())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

danger-manage-system/src/main/java/com/zehong/system/mapper/TTrainCourseBankMapper.java

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.TTrainCourseBank;
+
+/**
+ * bankMapper接口
+ * 
+ * @author zehong
+ * @date 2022-12-14
+ */
+public interface TTrainCourseBankMapper 
+{
+    /**
+     * 查询bank
+     * 
+     * @param bankId bankID
+     * @return bank
+     */
+    public TTrainCourseBank selectTTrainCourseBankById(Long bankId);
+
+    /**
+     * 查询bank列表
+     * 
+     * @param tTrainCourseBank bank
+     * @return bank集合
+     */
+    public List<TTrainCourseBank> selectTTrainCourseBankList(TTrainCourseBank tTrainCourseBank);
+
+    /**
+     * 新增bank
+     * 
+     * @param tTrainCourseBank bank
+     * @return 结果
+     */
+    public int insertTTrainCourseBank(TTrainCourseBank tTrainCourseBank);
+
+    /**
+     * 修改bank
+     * 
+     * @param tTrainCourseBank bank
+     * @return 结果
+     */
+    public int updateTTrainCourseBank(TTrainCourseBank tTrainCourseBank);
+
+    /**
+     * 删除bank
+     * 
+     * @param bankId bankID
+     * @return 结果
+     */
+    public int deleteTTrainCourseBankById(Long bankId);
+
+    /**
+     * 批量删除bank
+     * 
+     * @param bankIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTTrainCourseBankByIds(Long[] bankIds);
+}

danger-manage-system/src/main/java/com/zehong/system/service/ITTrainCourseBankService.java

+package com.zehong.system.service;
+
+import java.util.List;
+import com.zehong.system.domain.TTrainCourseBank;
+
+/**
+ * bankService接口
+ * 
+ * @author zehong
+ * @date 2022-12-14
+ */
+public interface ITTrainCourseBankService 
+{
+    /**
+     * 查询bank
+     * 
+     * @param bankId bankID
+     * @return bank
+     */
+    public TTrainCourseBank selectTTrainCourseBankById(Long bankId);
+
+    /**
+     * 查询bank列表
+     * 
+     * @param tTrainCourseBank bank
+     * @return bank集合
+     */
+    public List<TTrainCourseBank> selectTTrainCourseBankList(TTrainCourseBank tTrainCourseBank);
+
+    /**
+     * 新增bank
+     * 
+     * @param tTrainCourseBank bank
+     * @return 结果
+     */
+    public int insertTTrainCourseBank(TTrainCourseBank tTrainCourseBank);
+
+    /**
+     * 修改bank
+     * 
+     * @param tTrainCourseBank bank
+     * @return 结果
+     */
+    public int updateTTrainCourseBank(TTrainCourseBank tTrainCourseBank);
+
+    /**
+     * 批量删除bank
+     * 
+     * @param bankIds 需要删除的bankID
+     * @return 结果
+     */
+    public int deleteTTrainCourseBankByIds(Long[] bankIds);
+
+    /**
+     * 删除bank信息
+     * 
+     * @param bankId bankID
+     * @return 结果
+     */
+    public int deleteTTrainCourseBankById(Long bankId);
+}

danger-manage-system/src/main/java/com/zehong/system/service/impl/TMaintainPlanServiceImpl.java

@@ -69,6 +69,7 @@ public class TMaintainPlanServiceImpl implements ITMaintainPlanService
 
             TSpecialDeviceRecord tSpecialDeviceRecord = new TSpecialDeviceRecord();
             tSpecialDeviceRecord.setDeviceCode(tDeviceInfo.getDeviceCode());
+            tSpecialDeviceRecord.setDeviceId(tDeviceInfo.getId());
             tSpecialDeviceRecord.setOperateCode(planCode);
             tSpecialDeviceRecord.setOperateType("1");
             tSpecialDeviceRecord.setEffectiveDate(tMaintainPlan.getPlanEndTime());

danger-manage-system/src/main/java/com/zehong/system/service/impl/TRepairOrderServiceImpl.java

@@ -67,6 +67,7 @@ public class TRepairOrderServiceImpl implements ITRepairOrderService
 
         TSpecialDeviceRecord tSpecialDeviceRecord = new TSpecialDeviceRecord();
         tSpecialDeviceRecord.setDeviceCode(tDeviceInfo.getDeviceCode());
+        tSpecialDeviceRecord.setDeviceId(tDeviceInfo.getId());
         tSpecialDeviceRecord.setOperateCode(repairCode);
         tSpecialDeviceRecord.setOperateType("2");
         tSpecialDeviceRecord.setRecordStatus(tRepairOrder.getOrderStatus());

danger-manage-system/src/main/java/com/zehong/system/service/impl/TTrainCourseBankServiceImpl.java

+package com.zehong.system.service.impl;
+
+import java.util.List;
+import com.zehong.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zehong.system.mapper.TTrainCourseBankMapper;
+import com.zehong.system.domain.TTrainCourseBank;
+import com.zehong.system.service.ITTrainCourseBankService;
+
+/**
+ * bankService业务层处理
+ * 
+ * @author zehong
+ * @date 2022-12-14
+ */
+@Service
+public class TTrainCourseBankServiceImpl implements ITTrainCourseBankService 
+{
+    @Autowired
+    private TTrainCourseBankMapper tTrainCourseBankMapper;
+
+    /**
+     * 查询bank
+     * 
+     * @param bankId bankID
+     * @return bank
+     */
+    @Override
+    public TTrainCourseBank selectTTrainCourseBankById(Long bankId)
+    {
+        return tTrainCourseBankMapper.selectTTrainCourseBankById(bankId);
+    }
+
+    /**
+     * 查询bank列表
+     * 
+     * @param tTrainCourseBank bank
+     * @return bank
+     */
+    @Override
+    public List<TTrainCourseBank> selectTTrainCourseBankList(TTrainCourseBank tTrainCourseBank)
+    {
+        return tTrainCourseBankMapper.selectTTrainCourseBankList(tTrainCourseBank);
+    }
+
+    /**
+     * 新增bank
+     * 
+     * @param tTrainCourseBank bank
+     * @return 结果
+     */
+    @Override
+    public int insertTTrainCourseBank(TTrainCourseBank tTrainCourseBank)
+    {
+        tTrainCourseBank.setCreateTime(DateUtils.getNowDate());
+        return tTrainCourseBankMapper.insertTTrainCourseBank(tTrainCourseBank);
+    }
+
+    /**
+     * 修改bank
+     * 
+     * @param tTrainCourseBank bank
+     * @return 结果
+     */
+    @Override
+    public int updateTTrainCourseBank(TTrainCourseBank tTrainCourseBank)
+    {
+        tTrainCourseBank.setUpdateTime(DateUtils.getNowDate());
+        return tTrainCourseBankMapper.updateTTrainCourseBank(tTrainCourseBank);
+    }
+
+    /**
+     * 批量删除bank
+     * 
+     * @param bankIds 需要删除的bankID
+     * @return 结果
+     */
+    @Override
+    public int deleteTTrainCourseBankByIds(Long[] bankIds)
+    {
+        return tTrainCourseBankMapper.deleteTTrainCourseBankByIds(bankIds);
+    }
+
+    /**
+     * 删除bank信息
+     * 
+     * @param bankId bankID
+     * @return 结果
+     */
+    @Override
+    public int deleteTTrainCourseBankById(Long bankId)
+    {
+        return tTrainCourseBankMapper.deleteTTrainCourseBankById(bankId);
+    }
+}

danger-manage-system/src/main/resources/mapper/system/TDeviceInfoMapper.xml

@@ -19,11 +19,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
         <result property="isDel"    column="is_del"    />
+        <result property="isCancel"    column="is_cancel"    />
         <result property="remarks"    column="remarks"    />
     </resultMap>
 
     <sql id="selectTDeviceInfoVo">
-        select id, device_name, device_code, device_status, device_type, tag_number, device_grade, install_location, is_special, responsible_person, responsible_phone, create_time, update_time, is_del, remarks from t_device_info
+        select id, device_name, device_code, device_status, device_type, tag_number, device_grade, install_location, is_special, responsible_person, responsible_phone, create_time, update_time, is_cancel, is_del, remarks from t_device_info
     </sql>
 
     <select id="selectTDeviceInfoList" parameterType="TDeviceInfo" resultMap="TDeviceInfoResult">
@@ -36,6 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tagNumber != null  and tagNumber != ''"> and tag_number = #{tagNumber}</if>
             <if test="deviceGrade != null  and deviceGrade != ''"> and device_grade = #{deviceGrade}</if>
             <if test="isSpecial != null  and isSpecial != ''"> and is_special = #{isSpecial}</if>
+            <if test="isCancel != null  and isCancel != ''"> and is_cancel = #{isCancel}</if>
             <if test="responsiblePhone != null  and responsiblePhone != ''"> and responsible_phone = #{responsiblePhone}</if>
             <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
                 AND date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
@@ -103,9 +105,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="isDel != null">is_del = #{isDel},</if>
-            <if test="remarks != null">is_del = #{remarks},</if>
+            <if test="isCancel != null">is_cancel = #{isCancel},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
         </trim>
-        where device_code = #{deviceCode} and is_del = '0'
+        where id = #{id} and is_del = '0'
     </update>
 
     <delete id="deleteTDeviceInfoById" parameterType="Long">

danger-manage-system/src/main/resources/mapper/system/TEmergencyDrillMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zehong.system.mapper.TEmergencyDrillMapper">
-    
+
     <resultMap type="TEmergencyDrill" id="TEmergencyDrillResult">
         <result property="drillId"    column="drill_id"    />
         <result property="drillName"    column="drill_name"    />
@@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTEmergencyDrillVo">
-        select drill_id, drill_name, drill_address, drill_unit, drill_time, drill_type, drill_form, drill_objective, drill_people, drill_content, assessment, create_time, create_by, is_del from t_emergency_drill
+        select drill_id, drill_name, drill_address, drill_unit, drill_time, drill_type, drill_form, drill_objective, drill_people, drill_content, assessment, evaluate,measures,create_time, create_by, is_del from t_emergency_drill
     </sql>
 
     <select id="selectTEmergencyDrillList" parameterType="TEmergencyDrill" resultMap="TEmergencyDrillResult">
@@ -34,12 +34,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="drillForm != null "> and drill_form = #{drillForm}</if>
         </where>
     </select>
-    
+
     <select id="selectTEmergencyDrillById" parameterType="Long" resultMap="TEmergencyDrillResult">
         <include refid="selectTEmergencyDrillVo"/>
         where drill_id = #{drillId}
     </select>
-        
+
     <insert id="insertTEmergencyDrill" parameterType="TEmergencyDrill" useGeneratedKeys="true" keyProperty="drillId">
         insert into t_emergency_drill
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -89,6 +89,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="assessment != null">assessment = #{assessment},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="evaluate != null">evaluate = #{evaluate},</if>
+            <if test="measures != null">measures = #{measures},</if>
             <if test="isDel != null">is_del = #{isDel},</if>
         </trim>
         where drill_id = #{drillId}
@@ -99,9 +101,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteTEmergencyDrillByIds" parameterType="String">
-        delete from t_emergency_drill where drill_id in 
+        delete from t_emergency_drill where drill_id in
         <foreach item="drillId" collection="array" open="(" separator="," close=")">
             #{drillId}
         </foreach>
     </delete>
-</mapper>
+</mapper>
\ No newline at end of file

danger-manage-system/src/main/resources/mapper/system/TEnterpriseInfoMapper.xml

@@ -13,6 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="regulationType"    column="regulation_type"    />
         <result property="regDate"    column="reg_date"    />
         <result property="businessTerm"    column="business_term"    />
+        <result property="dutyPhone"    column="duty_phone"    />
         <result property="longitude"    column="longitude"    />
         <result property="latitude"    column="latitude"    />
         <result property="businessScope"    column="business_scope"    />
@@ -31,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTEnterpriseInfoVo">
-        select id, unit_name, org_code, run_address, reg_address, regulation_type, reg_date, business_term, longitude, latitude, business_scope, employee_num, legal_person, legal_person_phone, key_person, key_person_phone, safety_person, safety_person_phone, create_user_id, update_user_id, update_time, create_time, remarks from t_enterprise_info
+        select id, unit_name, org_code, run_address, reg_address, regulation_type, reg_date, business_term, duty_phone, longitude, latitude, business_scope, employee_num, legal_person, legal_person_phone, key_person, key_person_phone, safety_person, safety_person_phone, create_user_id, update_user_id, update_time, create_time, remarks from t_enterprise_info
     </sql>
 
     <select id="selectTEnterpriseInfoList" parameterType="TEnterpriseInfo" resultMap="TEnterpriseInfoResult">
@@ -75,6 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="regulationType != null">regulation_type,</if>
             <if test="regDate != null">reg_date,</if>
             <if test="businessTerm != null">business_term,</if>
+            <if test="dutyPhone != null">duty_phone,</if>
             <if test="longitude != null">longitude,</if>
             <if test="latitude != null">latitude,</if>
             <if test="businessScope != null">business_scope,</if>
@@ -100,6 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="regulationType != null">#{regulationType},</if>
             <if test="regDate != null">#{regDate},</if>
             <if test="businessTerm != null">#{businessTerm},</if>
+            <if test="dutyPhone != null">#{dutyPhone},</if>
             <if test="longitude != null">#{longitude},</if>
             <if test="latitude != null">#{latitude},</if>
             <if test="businessScope != null">#{businessScope},</if>
@@ -128,6 +131,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="regulationType != null">regulation_type = #{regulationType},</if>
             <if test="regDate != null">reg_date = #{regDate},</if>
             <if test="businessTerm != null">business_term = #{businessTerm},</if>
+            duty_phone = #{dutyPhone},
             longitude = #{longitude},
             latitude = #{latitude},
             business_scope = #{businessScope},

danger-manage-system/src/main/resources/mapper/system/TMaterialInfoMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zehong.system.mapper.TMaterialInfoMapper">
-    
+
     <resultMap type="TMaterialInfo" id="TMaterialInfoResult">
         <result property="id"    column="id"    />
         <result property="materialName"    column="material_name"    />
@@ -21,6 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
         <result property="isDelete"    column="is_delete"    />
+        <result property="deptName"    column="dept_name"    />
     </resultMap>
 
     <sql id="selectTMaterialInfoVo">
@@ -28,18 +29,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectTMaterialInfoList" parameterType="TMaterialInfo" resultMap="TMaterialInfoResult">
-        <include refid="selectTMaterialInfoVo"/>
-        <where>  
-            <if test="materialName != null  and materialName != ''"> and material_name like concat('%', #{materialName}, '%')</if>
-            <if test="materialType != null "> and material_type = #{materialType}</if>
+        select d.dept_name,a.id, a.material_name, a.material_type, a.num, a.performance, a.purpose, a.validity_time, a.dept_id, a.longitude, a.latitude, a.address, a.contacts, a.phone, a.create_time, a.update_time, a.is_delete
+        from t_material_info a
+        LEFT JOIN sys_dept d ON d.`dept_id` = a.`dept_id`
+        <where>
+            <if test="materialName != null  and materialName != ''"> and a.material_name like concat('%', #{materialName}, '%')</if>
+            <if test="materialType != null "> and a.material_type = #{materialType}</if>
         </where>
     </select>
-    
+
     <select id="selectTMaterialInfoById" parameterType="Long" resultMap="TMaterialInfoResult">
         <include refid="selectTMaterialInfoVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertTMaterialInfo" parameterType="TMaterialInfo" useGeneratedKeys="true" keyProperty="id">
         insert into t_material_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -105,9 +108,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteTMaterialInfoByIds" parameterType="String">
-        delete from t_material_info where id in 
+        delete from t_material_info where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
-</mapper>
+</mapper>
\ No newline at end of file

danger-manage-system/src/main/resources/mapper/system/TSpecialDeviceRecordMapper.xml

@@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select t.id, t.operate_code, t.operate_type, t.device_code, t.effective_date, t.record_status, t.create_time, t.update_time, t.is_del,
         d.device_name, d.device_type
         from t_special_device_record t
-        left join t_device_info d on t.device_code = d.device_code
+        left join t_device_info d on t.device_id = d.id
     </sql>
 
     <select id="selectTSpecialDeviceRecordList" parameterType="TSpecialDeviceRecord" resultMap="TSpecialDeviceRecordResult">
@@ -54,6 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="operateCode != null">operate_code,</if>
             <if test="operateType != null">operate_type,</if>
             <if test="deviceCode != null">device_code,</if>
+            <if test="deviceId != null">device_id,</if>
             <if test="effectiveDate != null">effective_date,</if>
             <if test="recordStatus != null">record_status,</if>
             <if test="createTime != null">create_time,</if>
@@ -65,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="operateCode != null">#{operateCode},</if>
             <if test="operateType != null">#{operateType},</if>
             <if test="deviceCode != null">#{deviceCode},</if>
+            <if test="deviceId != null">#{deviceId},</if>
             <if test="effectiveDate != null">#{effectiveDate},</if>
             <if test="recordStatus != null">#{recordStatus},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -78,6 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="operateType != null">operate_type = #{operateType},</if>
             <if test="deviceCode != null">device_code = #{deviceCode},</if>
+            <if test="deviceId != null">device_id = #{deviceId},</if>
             <if test="effectiveDate != null">effective_date = #{effectiveDate},</if>
             <if test="recordStatus != null">record_status = #{recordStatus},</if>
             <if test="createTime != null">create_time = #{createTime},</if>

danger-manage-system/src/main/resources/mapper/system/TTrainCourseBankMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zehong.system.mapper.TTrainCourseBankMapper">
+    
+    <resultMap type="TTrainCourseBank" id="TTrainCourseBankResult">
+        <result property="bankId"    column="bank_id"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="bankName"    column="bank_name"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectTTrainCourseBankVo">
+        select bank_id, dept_id, bank_name, is_del, create_by, create_time, update_by, update_time from t_train_course_bank
+    </sql>
+
+    <select id="selectTTrainCourseBankList" parameterType="TTrainCourseBank" resultMap="TTrainCourseBankResult">
+        <include refid="selectTTrainCourseBankVo"/>
+        <where>  
+            <if test="bankName != null  and bankName != ''"> and bank_name like concat('%', #{bankName}, '%')</if>
+        </where>
+    </select>
+    
+    <select id="selectTTrainCourseBankById" parameterType="Long" resultMap="TTrainCourseBankResult">
+        <include refid="selectTTrainCourseBankVo"/>
+        where bank_id = #{bankId}
+    </select>
+        
+    <insert id="insertTTrainCourseBank" parameterType="TTrainCourseBank" useGeneratedKeys="true" keyProperty="bankId">
+        insert into t_train_course_bank
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="deptId != null">dept_id,</if>
+            <if test="bankName != null">bank_name,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="deptId != null">#{deptId},</if>
+            <if test="bankName != null">#{bankName},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTTrainCourseBank" parameterType="TTrainCourseBank">
+        update t_train_course_bank
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="bankName != null">bank_name = #{bankName},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where bank_id = #{bankId}
+    </update>
+
+    <delete id="deleteTTrainCourseBankById" parameterType="Long">
+        delete from t_train_course_bank where bank_id = #{bankId}
+    </delete>
+
+    <delete id="deleteTTrainCourseBankByIds" parameterType="String">
+        delete from t_train_course_bank where bank_id in 
+        <foreach item="bankId" collection="array" open="(" separator="," close=")">
+            #{bankId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

danger-manage-web/src/api/system/questionBank.js

+import request from '@/utils/request'
+
+// 查询bank列表
+export function listBank(query) {
+  return request({
+    url: '/system/bank/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询bank详细
+export function getBank(bankId) {
+  return request({
+    url: '/system/bank/' + bankId,
+    method: 'get'
+  })
+}
+
+// 新增bank
+export function addBank(data) {
+  return request({
+    url: '/system/bank',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改bank
+export function updateBank(data) {
+  return request({
+    url: '/system/bank',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除bank
+export function delBank(bankId) {
+  return request({
+    url: '/system/bank/' + bankId,
+    method: 'delete'
+  })
+}
+
+// 导出bank
+export function exportBank(query) {
+  return request({
+    url: '/system/bank/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file

danger-manage-web/src/views/deviceManagement/deviceInfo/index.vue

@@ -29,8 +29,8 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="是否特种设备" prop="isSpecial">
-        <el-select v-model="queryParams.isSpecial" placeholder="请选择是否特种设备" clearable size="small">
+      <el-form-item label="是否报废" prop="isCancel">
+        <el-select v-model="queryParams.isCancel" placeholder="请选择是否报废" clearable size="small">
           <el-option label="否" value="0" />
           <el-option label="是" value="1" />
         </el-select>
@@ -74,25 +74,52 @@
     </el-row>
 
     <el-table v-loading="loading" :data="deviceInfoList" >
-      <el-table-column label="设备编码" align="center" prop="deviceCode" />
       <el-table-column label="设备名称" align="center" prop="deviceName" />
-      <el-table-column label="设备类型" align="center" prop="deviceType" :formatter="typeFormat" />
+      <el-table-column label="设备编码" align="center" prop="deviceCode" >
+        <template slot-scope="scope">
+          <span v-if="scope.row.deviceCode == '' || scope.row.deviceCode == null">-</span>
+          <span v-else>{{scope.row.deviceCode}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="设备类型" align="center" prop="deviceType">
+        <template slot-scope="scope">
+          <span v-if="scope.row.deviceType == '' || scope.row.deviceType == null">-</span>
+          <span v-if="scope.row.deviceType == '1'">液位探测器</span>
+          <span v-if="scope.row.deviceType == '2'">气体探测器</span>
+          <span v-if="scope.row.deviceType == '3'">液压力探测器</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="设备等级" align="center" prop="deviceGrade">
+        <template slot-scope="scope">
+          <span v-if="scope.row.deviceGrade == '' || scope.row.deviceGrade == null">-</span>
+          <span v-if="scope.row.deviceGrade == '1'">一级危险源</span>
+          <span v-if="scope.row.deviceGrade == '2'">二级危险源</span>
+          <span v-if="scope.row.deviceGrade == '3'">三级危险源</span>
+        </template>
+      </el-table-column>
       <el-table-column label="设备状态" align="center" prop="deviceStatus" :formatter="statusFormat" />
-      <el-table-column label="设备等级" align="center" prop="deviceGrade" :formatter="gradeFormat" />
-      <el-table-column label="是否特种设备" align="center" prop="isSpecial" >
+      <el-table-column label="是否报废" align="center" prop="isCancel" >
         <template slot-scope="scope">
-          <span v-if="scope.row.isSpecial == '0'">否</span>
-          <span v-if="scope.row.isSpecial == '1'">是</span>
+          <span v-if="scope.row.isCancel == '0'">否</span>
+          <span v-if="scope.row.isCancel == '1'">是</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
+            v-if="scope.row.isCancel=='0'"
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
           >修改</el-button>
+          <el-button
+            v-if="scope.row.isCancel=='0'"
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleCancel(scope.row)"
+          >报废</el-button>
           <el-button
             size="mini"
             type="text"
@@ -153,22 +180,22 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="11">
+          <!--<el-col :span="11">
             <el-form-item label="是否特种设备" prop="isSpecial">
               <el-select v-model="form.isSpecial" placeholder="请选择是否特种设备" clearable size="small" style="width: 100%">
                 <el-option label="否" value="0" />
                 <el-option label="是" value="1" />
               </el-select>
             </el-form-item>
-          </el-col>
-          <el-col :span="12">
+          </el-col>-->
+        </el-row>
+        <el-row>
+          <el-col :span="11">
             <el-form-item label="位号" prop="tagNumber">
               <el-input v-model="form.tagNumber" placeholder="请输入位号" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="23">
+          <el-col :span="12">
             <el-form-item label="安装位置" prop="installLocation">
               <el-input v-model="form.installLocation" placeholder="请输入安装位置" />
             </el-form-item>
@@ -272,7 +299,8 @@ export default {
         deviceType: null,
         tagNumber: null,
         deviceGrade: null,
-        isSpecial: null,
+        isSpecial: "0",
+        isCancel: null,
         responsiblePhone: null,
       },
       // 设备导入参数
@@ -297,7 +325,7 @@ export default {
         deviceName: [
           { required: true, message: "请输入设备名称", trigger: "blur" }
         ],
-        deviceCode: [
+        /*deviceCode: [
           { required: true, message: "请输入设备编号", trigger: "blur" }
         ],
         deviceType: [
@@ -305,10 +333,10 @@ export default {
         ],
         deviceGrade: [
           { required: true, message: "请选择设备等级", trigger: "blur" }
-        ],
-        isSpecial: [
+        ],*/
+        /*isSpecial: [
           { required: true, message: "请选择是否特种装备", trigger: "blur" }
-        ],
+        ],*/
       }
     };
   },
@@ -362,7 +390,7 @@ export default {
         tagNumber: null,
         deviceGrade: null,
         installLocation: null,
-        isSpecial: null,
+        isSpecial: "0",
         responsiblePerson: null,
         responsiblePhone: null,
         createTime: null,
@@ -408,6 +436,7 @@ export default {
               this.getList();
             });
           } else {
+            this.form.isSpecial="0";
             addDeviceInfo(this.form).then(response => {
               this.msgSuccess("新增成功");
               this.open = false;
@@ -417,6 +446,21 @@ export default {
         }
       });
     },
+    /** 报废报废按钮操作 */
+    handleCancel(row) {
+      // const ids = row.id || this.ids;
+      this.$confirm('是否确认将"' + row.deviceName + '"报废?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          row.isCancel = '1';
+          return updateDeviceInfo(row);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("报废成功");
+        }).catch(() => {});
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       // const ids = row.id || this.ids;

danger-manage-web/src/views/deviceManagement/specialDeviceRecord/index.vue

@@ -41,7 +41,12 @@
         </template>
       </el-table-column>
       <el-table-column label="设备名称" align="center" prop="deviceName" />
-      <el-table-column label="设备编号" align="center" prop="deviceCode" />
+      <el-table-column label="设备编号" align="center" prop="deviceCode" >
+        <template slot-scope="scope">
+          <span v-if="scope.row.deviceCode == '' || scope.row.deviceCode == null">-</span>
+          <span v-else>{{scope.row.deviceCode}}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="登记有效日期" align="center" prop="effectiveDate" width="180">
         <template slot-scope="scope">
           <span v-if="scope.row.effectiveDate != null && scope.row.effectiveDate != '' && getDays(scope.row.effectiveDate, new Date())<30 && getDays(scope.row.effectiveDate, new Date())>0" style="color: red;">

danger-manage-web/src/views/emergency/crew/index.vue

@@ -43,7 +43,6 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['emergency:crew:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -54,7 +53,6 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['emergency:crew:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -65,7 +63,6 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['emergency:crew:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -76,7 +73,6 @@
           size="mini"
 		  :loading="exportLoading"
           @click="handleExport"
-          v-hasPermi="['emergency:crew:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -96,14 +92,12 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['emergency:crew:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['emergency:crew:remove']"
           >删除</el-button>
         </template>
       </el-table-column>

danger-manage-web/src/views/safetyManagement/enterpriseInfo/index.vue

@@ -43,15 +43,23 @@
             <th>
               经营范围
             </th>
-            <td>
+            <td colspan="3">
               {{form.businessScope}}
             </td>
+          </tr>
+          <tr>
             <th>
               营业期限
             </th>
             <td>
               {{form.businessTerm}}
             </td>
+            <th>
+              值班电话
+            </th>
+            <td>
+              {{form.dutyPhone}}
+            </td>
           </tr>
           <tr>
             <th>
@@ -101,6 +109,20 @@
               <span v-else>-</span>
             </td>
           </tr>
+          <tr>
+            <th>
+              经度
+            </th>
+            <td>
+              {{form.longitude}}
+            </td>
+            <th>
+              纬度
+            </th>
+            <td>
+              {{form.latitude}}
+            </td>
+          </tr>
           <tr>
             <th>
               生产经营地址
@@ -188,30 +210,37 @@
           </el-col>
         </el-row>
         <el-row>
-        <el-col :span="11">
-          <el-form-item label="经营范围" prop="businessScope">
-            <el-input v-model="form.businessScope" placeholder="请输入经营范围" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="营业期限" prop="businessTerm">
-            <el-input v-model="form.businessTerm" placeholder="请输入营业期限" />
-          </el-form-item>
-        </el-col>
+          <el-col :span="23">
+            <el-form-item label="经营范围" prop="businessScope">
+              <el-input v-model="form.businessScope" placeholder="请输入经营范围" />
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
-        <el-col :span="23">
-          <el-form-item label="生产经营地址" prop="runAddress">
-            <el-input v-model="form.runAddress" placeholder="请输入生产经营地址" />
-          </el-form-item>
-        </el-col>
+          <el-col :span="11">
+            <el-form-item label="营业期限" prop="businessTerm">
+              <el-input v-model="form.businessTerm" placeholder="请输入营业期限" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="值班电话" prop="dutyPhone">
+              <el-input v-model="form.dutyPhone" placeholder="请输入值班电话" />
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
-        <el-col :span="23">
-          <el-form-item label="注册地址" prop="regAddress">
-            <el-input v-model="form.regAddress" placeholder="请输入注册地址" />
-          </el-form-item>
-        </el-col>
+          <el-col :span="23">
+            <el-form-item label="生产经营地址" prop="runAddress">
+              <el-input v-model="form.runAddress" placeholder="请输入生产经营地址" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="23">
+            <el-form-item label="注册地址" prop="regAddress">
+              <el-input v-model="form.regAddress" placeholder="请输入注册地址" />
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
         <el-col :span="23">
@@ -365,6 +394,9 @@ export default {
         businessTerm: [
           { required: true, message: "请输入营业期限", trigger: "blur" }
         ],
+        dutyPhone: [
+          { required: true, message: "请输入值班电话", trigger: "blur" }
+        ],
         runAddress: [
           { required: true, message: "请输入生产经营地址", trigger: "blur" }
         ],

danger-manage-web/src/views/system/drill/index.vue

@@ -91,12 +91,15 @@
       <el-table-column label="演练地址" align="center" prop="drillAddress" />
       <el-table-column label="主办单位" align="center" prop="drillUnit" />
       <el-table-column label="演练时间" align="center" prop="drillTime" width="180"/>
-
       <!--<el-table-column label="演练目的" align="center" prop="drillObjective" />-->
       <!--<el-table-column label="参演人员" align="center" prop="drillPeople" />-->
       <!--<el-table-column label="演练内容" align="center" prop="drillContent" />-->
       <!--<el-table-column label="评估" align="center" prop="assessment" />-->
       <el-table-column label="创建时间" align="center" prop="createTime" width="180"/>
+      <el-table-column  label="状态" align="center" prop="evaluate" >
+        <span slot-scope="scope" v-if="scope.row.evaluate">已完成</span>
+        <span v-else>待评估</span>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -112,6 +115,13 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
           >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit-outline"
+            v-if="!scope.row.evaluate"
+            @click="assessment(scope.row)"
+          >评估</el-button>
           <el-button
             size="mini"
             type="text"
@@ -233,6 +243,14 @@
               <editor v-model="form.drillContent" :min-height="240" :readOnly="readOnly"/>
             </el-form-item>
           </div>
+          <div class="div-kuang" style="width: 50%;margin-left: 2%">
+          <el-form-item label="总结评价:" >
+            <span>{{form.evaluate}}</span>
+          </el-form-item>
+          <el-form-item label="整改措施:">
+            <span>{{form.measures}}</span>
+          </el-form-item>
+          </div>
         </div>
 
 
@@ -241,6 +259,22 @@
         <!--</el-form-item>-->
       </el-form>
     </el-dialog>
+
+    <!--评估-->
+    <el-dialog title="评估" :visible.sync="dialogFormVisible">
+      <el-form  ref="form" :model="form">
+        <el-form-item label="演练效果和总结评价:" >
+          <el-input  maxlength="2000" v-model="form.evaluate"  type="textarea" :rows="4" autocomplete="off" show-word-limit></el-input>
+        </el-form-item>
+        <el-form-item label="演练存在的问题及整改措施:" >
+          <el-input   maxlength="2000" v-model="form.measures" type="textarea" :rows="4" autocomplete="off" show-word-limit></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="dialogFormVisible = false">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -277,6 +311,8 @@ export default {
       // 是否显示弹出层
       open: false,
       open2:false,
+      //评估
+      dialogFormVisible:false,
       // 演练类型字典
       drillTypeOptions: [],
       // 演练形式字典
@@ -359,7 +395,9 @@ export default {
         assessment: null,
         createTime: null,
         createBy: null,
-        isDel: null
+        isDel: null,
+        evaluate:null,
+        measures:null,
       };
       this.resetForm("form");
     },
@@ -394,15 +432,30 @@ export default {
         this.open = true;
         this.title = "修改应急演练";
       });
+    },
+    /** 评估按钮操作 */
+    assessment(row) {
+      this.reset();
+      const drillId = row.drillId || this.ids
+      getDrill(drillId).then(response => {
+        this.form = response.data;
+        this.dialogFormVisible = true;
+      });
+    },
+    /*评估提交*/
+    submitAssessment(){
+
     },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
+        console.log(this.form.drillId)
         if (valid) {
           if (this.form.drillId != null) {
             updateDrill(this.form).then(response => {
               this.msgSuccess("修改成功");
               this.open = false;
+              this.dialogFormVisible=false;
               this.getList();
             });
           } else {

danger-manage-web/src/views/system/info/index.vue

@@ -86,8 +86,9 @@
       <!--<el-table-column label="经度" align="center" prop="longitude" />-->
       <!--<el-table-column label="维度" align="center" prop="latitude" />-->
       <el-table-column label="地址信息" align="center" prop="address" />
-      <el-table-column label="联系人" align="center" prop="contacts" width="100"/>
-      <el-table-column label="手机号" align="center" prop="phone" width="180"/>
+      <el-table-column label="责任部门" align="center" prop="deptName" />
+<!--      <el-table-column label="联系人" align="center" prop="contacts" width="100"/>-->
+<!--      <el-table-column label="手机号" align="center" prop="phone" width="180"/>-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="210">
         <template slot-scope="scope">
           <el-button
@@ -141,9 +142,6 @@
                   ></el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item label="物资数量" prop="num">
-                <el-input v-model="form.num" placeholder="请输入物资数量" />
-              </el-form-item>
             </div>
             <div style="width: 50%">
               <el-form-item label="有效时间" prop="validityTime">
@@ -155,25 +153,41 @@
                                 placeholder="选择有效时间">
                 </el-date-picker>
               </el-form-item>
-              <el-form-item label="联系人" prop="contacts">
-                <el-input v-model="form.contacts" placeholder="请输入联系人" />
-              </el-form-item>
-              <el-form-item label="手机号" prop="phone">
-                <el-input v-model="form.phone" placeholder="请输入手机号" />
+              <el-form-item label="物资数量" prop="num">
+                <el-input v-model="form.num" placeholder="请输入物资数量" />
               </el-form-item>
+              <el-col :span="12">
+                <el-form-item label="责任部门" prop="deptId">
+                  <!--<el-input v-model="form.deptId" placeholder="请输入部门id" />-->
+                  <el-select v-model="form.deptId" filterable placeholder="请选择责任部门">
+                    <el-option
+                      v-for="dict in deptList"
+                      :key="dict.deptId"
+                      :label="dict.deptName"
+                      :value="parseInt(dict.deptId)"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+<!--              <el-form-item label="联系人" prop="contacts">-->
+<!--                <el-input v-model="form.contacts" placeholder="请输入联系人" />-->
+<!--              </el-form-item>-->
+<!--              <el-form-item label="手机号" prop="phone">-->
+<!--                <el-input v-model="form.phone" placeholder="请输入手机号" />-->
+<!--              </el-form-item>-->
             </div>
         </div>
-        <div class="division" style="width: 100%">
-          <el-form-item label="经纬度" prop="longitude">
-            <div class="division">
-              <el-input v-model="form.longitude" placeholder="请输入经度" />
-              <el-input style="margin-left: 10px" v-model="form.latitude" placeholder="请输入维度" />
-            </div>
-          </el-form-item>
+<!--        <div class="division" style="width: 100%">-->
+<!--          <el-form-item label="经纬度" prop="longitude">-->
+<!--            <div class="division">-->
+<!--              <el-input v-model="form.longitude" placeholder="请输入经度" />-->
+<!--              <el-input style="margin-left: 10px" v-model="form.latitude" placeholder="请输入维度" />-->
+<!--            </div>-->
+<!--          </el-form-item>-->
 
-          <el-button style=" height: 36px;margin-left: 10px" type="primary" plain @click="MapdialogFun">选择经纬度</el-button>
-          <!--<div class="btn">选择经纬度</div>-->
-        </div>
+<!--          <el-button style=" height: 36px;margin-left: 10px" type="primary" plain @click="MapdialogFun">选择经纬度</el-button>-->
+<!--          &lt;!&ndash;<div class="btn">选择经纬度</div>&ndash;&gt;-->
+<!--        </div>-->
         <el-form-item label="地址信息" prop="address">
           <el-input v-model="form.address" placeholder="请输入地址信息" />
         </el-form-item>
@@ -211,11 +225,20 @@
             <el-form-item label="有效时间:" prop="validityTime">
               <span>{{form.validityTime}}</span>
             </el-form-item>
-            <el-form-item label="联系人:" prop="contacts">
-              <span>{{form.contacts}}</span>
+<!--            <el-form-item label="联系人:" prop="contacts">-->
+<!--              <span>{{form.contacts}}</span>-->
+<!--            </el-form-item>-->
+<!--            <el-form-item label="手机号:" prop="phone">-->
+<!--              <span>{{form.phone}}</span>-->
+<!--            </el-form-item>-->
+            <el-form-item label="地址信息:" prop="address">
+              <span>{{form.address}}</span>
             </el-form-item>
-            <el-form-item label="手机号:" prop="phone">
-              <span>{{form.phone}}</span>
+            <el-form-item label="性能:" prop="performance">
+              <span>{{form.performance}}</span>
+            </el-form-item>
+            <el-form-item label="用途:" prop="purpose">
+              <span>{{form.purpose}}</span>
             </el-form-item>
           </div>
           <div style="width: 60%;height: 340px;background: #99a9bf" id="enterpriseContainer">
@@ -229,15 +252,7 @@
 
           <!--&lt;!&ndash;<div class="btn">选择经纬度</div>&ndash;&gt;-->
         <!--</div>-->
-        <el-form-item label="地址信息:" prop="address">
-          <span>{{form.address}}</span>
-        </el-form-item>
-        <el-form-item label="性能:" prop="performance">
-          <span>{{form.performance}}</span>
-        </el-form-item>
-        <el-form-item label="用途:" prop="purpose">
-          <span>{{form.purpose}}</span>
-        </el-form-item>
+
 
 
       </el-form>
@@ -255,6 +270,7 @@
 <script>
 import { listInfo, getInfo, delInfo, addInfo, updateInfo, exportInfo } from "@/api/system/info";
 import GetPos from '@/components/GetPos';
+import { listDept } from "@/api/system/dept";
 import { EditorMap } from "@/utils/mapClass/getPath.js";
 
 export default {
@@ -280,6 +296,7 @@ export default {
       total: 0,
       // 应急物资管理表格数据
       infoList: [],
+      deptList:[],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -331,6 +348,7 @@ export default {
   },
   created() {
     this.getList();
+    this.getDeptList();
     this.getDicts("t_material_type").then(response => {
       this.materialTypeOptions = response.data;
     });
@@ -345,6 +363,12 @@ export default {
         this.loading = false;
       });
     },
+    getDeptList() {
+      listDept({status: undefined}).then(response => {
+        this.deptList = response.data;
+        console.log(this.deptList)
+      });
+    },
     // 分类字典翻译
     materialTypeFormat(row, column) {
       return this.selectDictLabel(this.materialTypeOptions, row.materialType);

danger-manage-web/src/views/system/plan/index.vue

@@ -325,12 +325,6 @@
           planTitle: [
             { required: true, message: "标题不能为空", trigger: "blur" }
           ],
-          planType: [
-            { required: true, message: "预案类型不能为空", trigger: "blur" }
-          ],
-          planLevel: [
-            { required: true, message: "预案等级不能为空", trigger: "blur" }
-          ]
         }
       };
     },