fix:载体下发登记接口提交

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

@@ -1,11 +1,19 @@
 package com.ruoyi.web.controller.carrier.issued;
 
+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.TdCarrierIssued;
 import com.ruoyi.web.controller.manager.CarrierIssuedManager;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * ClassName: CarrierIssuedController
@@ -26,4 +34,94 @@ public class CarrierIssuedController extends BaseController {
     private CarrierIssuedManager carrierIssuedManager;
 
 
+    @RequiresPermissions("system:carrierIssued:view")
+    @GetMapping()
+    public String carrierIssued() {
+        return prefix + "/carrierIssued";
+    }
+
+
+
+    /**
+     * 载体列表
+     */
+    @RequiresPermissions("system:carrierIssued:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(TdCarrierIssued tdCarrierIssued) {
+        startPage();
+        List<TdCarrierIssued> carriers = carrierIssuedManager.selectTdCarrierList(tdCarrierIssued);
+        return getDataTable(carriers);
+    }
+
+
+    /**
+     * 新增载体
+     */
+    @GetMapping("/add")
+    public String add() {
+        return prefix + "/add";
+    }
+
+
+    /**
+     * 新增载体
+     */
+    @RequiresPermissions("system:carrierIssued:add")
+    @Log(title = "国家秘密载体登记", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(TdCarrierIssued tdCarrierIssued) {
+        return toAjax(carrierIssuedManager.saveOrUpdate(tdCarrierIssued));
+    }
+
+    /**
+     * 修改场国家秘密载体
+     */
+    @RequiresPermissions("system:carrierIssued:edit")
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") String id, ModelMap mmap) {
+        TdCarrierIssued tdCarrierIssued = carrierIssuedManager.selectTdCarrier(id);
+        mmap.put("tdCarrierIssued", tdCarrierIssued);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改国家秘密载体
+     */
+    @RequiresPermissions("system:carrierIssued:edit")
+    @Log(title = "国家秘密载体修改", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(TdCarrierIssued tdCarrierIssued) {
+        return toAjax(carrierIssuedManager.saveOrUpdate(tdCarrierIssued));
+    }
+
+    /**
+     * 详情国家秘密载体
+     */
+    @RequiresPermissions("system:carrierIssued:detail")
+    @GetMapping("/detail/{id}")
+    public String detail(@PathVariable("id") String id, ModelMap mmap) {
+        TdCarrierIssued tdCarrierIssued = carrierIssuedManager.selectTdCarrier(id);
+        mmap.put("tdCarrierIssued", tdCarrierIssued);
+        return prefix + "/detail";
+    }
+
+
+    /**
+     * 删除国家秘密载体
+     */
+    @RequiresPermissions("system:carrier:remove")
+    @Log(title = "国家秘密载体", businessType = BusinessType.DELETE)
+    @PostMapping("/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids) {
+        return toAjax(carrierIssuedManager.deletedTdCarrierByids(ids));
+    }
+
+
+
+
+
 }

ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java

@@ -304,6 +304,7 @@ public class ShiroConfig
         filterChainDefinitionMap.put("/register", "anon,captchaValidate");
 
         filterChainDefinitionMap.put("/license/**", "anon,captchaValidate");
+        filterChainDefinitionMap.put("/monitor/**", "anon,captchaValidate");
         // 系统权限列表
         // filterChainDefinitionMap.putAll(SpringUtils.getBean(IMenuService.class).selectPermsAll());
 

ruoyi-system/src/main/java/com/ruoyi/system/mapper/carrier/TdCarrierIssuedMapper.java

@@ -4,6 +4,8 @@ package com.ruoyi.system.mapper.carrier;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.carrier.TdCarrierIssued;
 
+import java.util.List;
+
 /**
 * @author Administrator
 * @description 针对表【td_carrier_issued(载体下发)】的数据库操作Mapper
@@ -12,6 +14,12 @@ import com.ruoyi.system.domain.carrier.TdCarrierIssued;
 */
 public interface TdCarrierIssuedMapper extends BaseMapper<TdCarrierIssued> {
 
+
+    public List<TdCarrierIssued> selectTdCarrierList(TdCarrierIssued tdCarrierIssued);
+
+
+    public List<TdCarrierIssued> selectTdCarrierUpdateList(TdCarrierIssued tdCarrierIssued);
+
 }
 
 

ruoyi-system/src/main/java/com/ruoyi/system/service/carrier/TdCarrierIssuedService.java

@@ -2,8 +2,11 @@ package com.ruoyi.system.service.carrier;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.system.domain.carrier.TdCarrier;
 import com.ruoyi.system.domain.carrier.TdCarrierIssued;
 
+import java.util.List;
+
 /**
 * @author Administrator
 * @description 针对表【td_carrier_issued(载体下发)】的数据库操作Service
@@ -11,4 +14,10 @@ import com.ruoyi.system.domain.carrier.TdCarrierIssued;
 */
 public interface TdCarrierIssuedService extends IService<TdCarrierIssued> {
 
+
+    public List<TdCarrierIssued> selectTdCarrierList(TdCarrierIssued tdCarrierIssued);
+
+
+    public List<TdCarrierIssued> selectTdCarrierUpdateList(TdCarrierIssued tdCarrierIssued);
+
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/carrier/impl/TdCarrierIssuedServiceImpl.java

@@ -3,9 +3,13 @@ package com.ruoyi.system.service.carrier.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.system.domain.carrier.TdCarrierIssued;
 import com.ruoyi.system.mapper.carrier.TdCarrierIssuedMapper;
+import com.ruoyi.system.mapper.carrier.TdCarrierMapper;
 import com.ruoyi.system.service.carrier.TdCarrierIssuedService;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.List;
+
 /**
 * @author Administrator
 * @description 针对表【td_carrier_issued(载体下发)】的数据库操作Service实现
@@ -15,6 +19,17 @@ import org.springframework.stereotype.Service;
 public class TdCarrierIssuedServiceImpl extends ServiceImpl<TdCarrierIssuedMapper, TdCarrierIssued>
     implements TdCarrierIssuedService {
 
+    @Resource
+    private TdCarrierIssuedMapper tdCarrierIssuedMapper;
+    @Override
+    public List<TdCarrierIssued> selectTdCarrierList(TdCarrierIssued tdCarrierIssued) {
+        return tdCarrierIssuedMapper.selectTdCarrierList(tdCarrierIssued);
+    }
+
+    @Override
+    public List<TdCarrierIssued> selectTdCarrierUpdateList(TdCarrierIssued tdCarrierIssued) {
+        return tdCarrierIssuedMapper.selectTdCarrierUpdateList(tdCarrierIssued);
+    }
 }
 
 

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

@@ -56,4 +56,65 @@
         destory_stand,issued_dept,expiration_time,
         mentSend_time,reclaim_time
     </sql>
+    <select id="selectTdCarrierList" resultType="com.ruoyi.system.domain.carrier.TdCarrierIssued">
+        select  <include refid="Base_Column_List"/> from  td_carrier
+        <trim prefix="where" prefixOverrides="and|or">
+            <if test="carrierName!=null and carrierName!=''">
+                AND carrier_name LIKE concat('%',#{carrierName},'%')
+            </if>
+            <if test="carrierLevel!=null and carrierLevel!=''">
+                AND carrier_level = #{carrierLevel}
+            </if>
+            <if test="carrierExtent!=null and carrierExtent!=''">
+                AND carrier_extent = #{carrierExtent}
+            </if>
+            <if test="carrierSecret!=null and carrierSecret!=''">
+                AND carrier_secret = #{carrierSecret}
+            </if>
+            <if test="carrierNumber!=null and carrierNumber!=''">
+                AND carrier_number = #{carrierNumber}
+            </if>
+            <if test="areaCity!=null and areaCity!=''">
+                AND area_city = #{areaCity}
+            </if>
+            <if test="areaDistrict!=null and areaDistrict!=''">
+                AND area_district = #{areaDistrict}
+            </if>
+            <if test="status!=null and status!=''">
+                AND status = #{status}
+            </if>
+        </trim>
+        ORDER BY create_time DESC
+    </select>
+
+    <select id="selectTdCarrierUpdateList" resultType="com.ruoyi.system.domain.carrier.TdCarrierIssued">
+        select  <include refid="Base_Column_List"/> from  td_carrier
+        <trim prefix="where" prefixOverrides="and|or">
+            <if test="carrierName!=null and carrierName!=''">
+                AND carrier_name LIKE concat('%',#{carrierName},'%')
+            </if>
+            <if test="carrierLevel!=null and carrierLevel!=''">
+                AND carrier_level = #{carrierLevel}
+            </if>
+            <if test="carrierExtent!=null and carrierExtent!=''">
+                AND carrier_extent = #{carrierExtent}
+            </if>
+            <if test="carrierSecret!=null and carrierSecret!=''">
+                AND carrier_secret = #{carrierSecret}
+            </if>
+            <if test="carrierNumber!=null and carrierNumber!=''">
+                AND carrier_number = #{carrierNumber}
+            </if>
+            <if test="areaCity!=null and areaCity!=''">
+                AND area_city = #{areaCity}
+            </if>
+            <if test="areaDistrict!=null and areaDistrict!=''">
+                AND area_district = #{areaDistrict}
+            </if>
+            <if test="status!=null and status!=''">
+                AND status !='5'
+            </if>
+        </trim>
+        ORDER BY create_time DESC
+    </select>
 </mapper>