Merge remote-tracking branch 'origin/new-exam' into new-exam

ruoyi-admin/src/main/java/com/ruoyi/web/controller/carrier/CarrierController.java

@@ -28,20 +28,17 @@ import java.util.List;
 @RequestMapping("/system/carrier")
 public class CarrierController extends BaseController {
 
-
     private String prefix = "system/carrier";
 
     @Resource
     private CarrierManager carrierManager;
 
-
     @RequiresPermissions("system:carrier:view")
     @GetMapping()
     public String carrier() {
         return prefix + "/carrier";
     }
 
-
     /**
      * 载体列表
      */
@@ -126,10 +123,4 @@ public class CarrierController extends BaseController {
         return toAjax(carrierManager.updateStatus(id,status));
     }
 
-
-
-
-
-
-
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/carrier/DestoryCarrierController.java

@@ -0,0 +1,68 @@
+package com.ruoyi.web.controller.carrier;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.carrier.TdCarrier;
+import com.ruoyi.web.controller.manager.CarrierManager;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 销毁Controller
+ */
+@Controller
+@RequestMapping("/system/destoryCarrier")
+public class DestoryCarrierController extends BaseController {
+    private String prefix = "system/carrier/destoryCarrier";
+
+    @Resource
+    private CarrierManager carrierManager;
+
+    @RequiresPermissions("system:destoryCarrier:view")
+    @GetMapping()
+    public String carrier() {
+        return prefix + "/destoryCarrier";
+    }
+
+    /**
+     * 载体列表
+     */
+    @RequiresPermissions("system:destoryCarrier:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(TdCarrier tdCarrier) {
+        startPage();
+        List<TdCarrier> carriers = carrierManager.selectTdCarrierList(tdCarrier);
+        return getDataTable(carriers);
+    }
+
+    /**
+     * 国家秘密载体销毁
+     */
+    @RequiresPermissions("system:destoryCarrier:edit")
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") String id, ModelMap mmap) {
+        TdCarrier tdCarrier = carrierManager.selectTdCarrier(id);
+        mmap.put("tdCarrier", tdCarrier);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 国家秘密载体销毁
+     */
+    @RequiresPermissions("system:destoryCarrier:edit")
+    @Log(title = "国家秘密载体销毁", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(TdCarrier tdCarrier) {
+        return toAjax(carrierManager.saveOrUpdate(tdCarrier));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/carrier/MaintainCarrierController.java

@@ -0,0 +1,68 @@
+package com.ruoyi.web.controller.carrier;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.carrier.TdCarrier;
+import com.ruoyi.web.controller.manager.CarrierManager;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 维修Controller
+ */
+@Controller
+@RequestMapping("/system/maintainCarrier")
+public class MaintainCarrierController extends BaseController {
+    private String prefix = "system/carrier/maintainCarrier";
+
+    @Resource
+    private CarrierManager carrierManager;
+
+    @RequiresPermissions("system:maintainCarrier:view")
+    @GetMapping()
+    public String carrier() {
+        return prefix + "/maintainCarrier";
+    }
+
+    /**
+     * 载体列表
+     */
+    @RequiresPermissions("system:maintainCarrier:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(TdCarrier tdCarrier) {
+        startPage();
+        List<TdCarrier> carriers = carrierManager.selectTdCarrierList(tdCarrier);
+        return getDataTable(carriers);
+    }
+
+    /**
+     * 国家秘密载体维修
+     */
+    @RequiresPermissions("system:maintainCarrier:edit")
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") String id, ModelMap mmap) {
+        TdCarrier tdCarrier = carrierManager.selectTdCarrier(id);
+        mmap.put("tdCarrier", tdCarrier);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 国家秘密载体维修
+     */
+    @RequiresPermissions("system:maintainCarrier:edit")
+    @Log(title = "国家秘密载体维修", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(TdCarrier tdCarrier) {
+        return toAjax(carrierManager.saveOrUpdate(tdCarrier));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/carrier/ReceiveCarrierController.java

@@ -0,0 +1,68 @@
+package com.ruoyi.web.controller.carrier;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.carrier.TdCarrier;
+import com.ruoyi.web.controller.manager.CarrierManager;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 收发传递Controller
+ */
+@Controller
+@RequestMapping("/system/recCarrier")
+public class ReceiveCarrierController extends BaseController {
+    private String prefix = "system/carrier/receiveCarrier";
+
+    @Resource
+    private CarrierManager carrierManager;
+
+    @RequiresPermissions("system:recCarrier:view")
+    @GetMapping()
+    public String carrier() {
+        return prefix + "/receiveCarrier";
+    }
+
+    /**
+     * 载体列表
+     */
+    @RequiresPermissions("system:recCarrier:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(TdCarrier tdCarrier) {
+        startPage();
+        List<TdCarrier> carriers = carrierManager.selectTdCarrierList(tdCarrier);
+        return getDataTable(carriers);
+    }
+
+    /**
+     * 收发传递国家秘密载体
+     */
+    @RequiresPermissions("system:recCarrier:edit")
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") String id, ModelMap mmap) {
+        TdCarrier tdCarrier = carrierManager.selectTdCarrier(id);
+        mmap.put("tdCarrier", tdCarrier);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 收发传递国家秘密载体
+     */
+    @RequiresPermissions("system:recCarrier:edit")
+    @Log(title = "载体收发传递", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(TdCarrier tdCarrier) {
+        return toAjax(carrierManager.saveOrUpdate(tdCarrier));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/carrier/SaveCarrierController.java

@@ -0,0 +1,69 @@
+package com.ruoyi.web.controller.carrier;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.carrier.TdCarrier;
+import com.ruoyi.web.controller.manager.CarrierManager;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+
+/**
+ * 保存Controller
+ */
+@Controller
+@RequestMapping("system/saveCarrier")
+public class SaveCarrierController extends BaseController {
+    private String prefix = "system/carrier/saveCarrier";
+
+    @Resource
+    private CarrierManager carrierManager;
+
+    @RequiresPermissions("system:saveCarrier:view")
+    @GetMapping()
+    public String carrier() {
+        return prefix + "/saveCarrier";
+    }
+
+    /**
+     * 载体列表
+     */
+    @RequiresPermissions("system:saveCarrier:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(TdCarrier tdCarrier) {
+        startPage();
+        List<TdCarrier> carriers = carrierManager.selectTdCarrierList(tdCarrier);
+        return getDataTable(carriers);
+    }
+
+    /**
+     * 国家秘密载体保存
+     */
+    @RequiresPermissions("system:saveCarrier:edit")
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") String id, ModelMap mmap) {
+        TdCarrier tdCarrier = carrierManager.selectTdCarrier(id);
+        mmap.put("tdCarrier", tdCarrier);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 国家秘密载体保存
+     */
+    @RequiresPermissions("system:saveCarrier:edit")
+    @Log(title = "国家秘密载体保存", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(TdCarrier tdCarrier) {
+        return toAjax(carrierManager.saveOrUpdate(tdCarrier));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/carrier/UseCarrierController.java

@@ -0,0 +1,69 @@
+package com.ruoyi.web.controller.carrier;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.carrier.TdCarrier;
+import com.ruoyi.web.controller.manager.CarrierManager;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+
+/**
+ * 使用Controller
+ */
+@Controller
+@RequestMapping("/system/useCarrier")
+public class UseCarrierController extends BaseController {
+    private String prefix = "system/carrier/useCarrier";
+
+    @Resource
+    private CarrierManager carrierManager;
+
+    @RequiresPermissions("system:useCarrier:view")
+    @GetMapping()
+    public String carrier() {
+        return prefix + "/useCarrier";
+    }
+
+    /**
+     * 载体列表
+     */
+    @RequiresPermissions("system:useCarrier:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(TdCarrier tdCarrier) {
+        startPage();
+        List<TdCarrier> carriers = carrierManager.selectTdCarrierList(tdCarrier);
+        return getDataTable(carriers);
+    }
+
+    /**
+     * 国家秘密载体使用
+     */
+    @RequiresPermissions("system:useCarrier:edit")
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") String id, ModelMap mmap) {
+        TdCarrier tdCarrier = carrierManager.selectTdCarrier(id);
+        mmap.put("tdCarrier", tdCarrier);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 国家秘密载体使用
+     */
+    @RequiresPermissions("system:useCarrier:edit")
+    @Log(title = "国家秘密载体使用", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(TdCarrier tdCarrier) {
+        return toAjax(carrierManager.saveOrUpdate(tdCarrier));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyEmentDestoryController.java

@@ -45,7 +45,7 @@ public class TdPropertyEmentDestoryController extends BaseController {
     }
 
     /**
-     * 涉密设备维修列变更
+     * 涉密设备销毁列变更
      */
     @RequiresPermissions("system:ementDestory:destroy")
     @GetMapping("/destory/{id}")

ruoyi-system/src/main/resources/mapper/system/TdCarrierMapper.xml

@@ -27,7 +27,7 @@
             <result property="mentsTime" column="ments_time" jdbcType="TIMESTAMP"/>
             <result property="usageUser" column="usage_user" jdbcType="VARCHAR"/>
             <result property="saveLocation" column="save_location" jdbcType="VARCHAR"/>
-            <result property="locationRequire" column="location_ require" jdbcType="VARCHAR"/>
+            <result property="locationRequire" column="location_require" jdbcType="VARCHAR"/>
             <result property="maintainDepart" column="maintain_depart" jdbcType="VARCHAR"/>
             <result property="maintainUser" column="maintain_user" jdbcType="VARCHAR"/>
             <result property="maintainDate" column="maintain_date" jdbcType="TIMESTAMP"/>
@@ -51,7 +51,7 @@
         Issuing_unit,Issuing_time,Issuing_user,
         delivery_method,carrier_vehicle,ments_use,
         ments_time,usage_user,save_location,
-        location_ require,maintain_depart,maintain_user,
+        location_require,maintain_depart,maintain_user,
         maintain_date,destory_depart,destory_user,
         destory_date,destory_manner,status,
         create_by,create_time,update_by,