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

ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/TdPlaceRegistManager.java

@@ -1,9 +1,16 @@
 package com.ruoyi.web.controller.manager;
 
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.text.CharSequenceUtil;
+import com.ruoyi.common.utils.ShiroUtils;
+import com.ruoyi.system.domain.place.TdPlaceRegist;
 import com.ruoyi.system.service.place.TdPlaceRegistService;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
 
 /**
  * packageName com.ruoyi.web.controller.manager
@@ -20,4 +27,32 @@ public class TdPlaceRegistManager {
 
     @Resource
     private TdPlaceRegistService placeRegistService;
+
+
+    public List<TdPlaceRegist> selectTdPlaceRegistList(TdPlaceRegist tdPlaceRegist) {
+        return placeRegistService.selectTdPlaceRegistList(tdPlaceRegist);
+    }
+
+    public boolean saveOrUpdate(TdPlaceRegist tdPlaceRegist) {
+        if (CharSequenceUtil.isNotBlank(tdPlaceRegist.getId())) {
+            tdPlaceRegist.setUpdateBy(ShiroUtils.getSysUser().getLoginName());
+            tdPlaceRegist.setUpdateTime(new Date());
+        } else {
+            tdPlaceRegist.setCreateBy(ShiroUtils.getSysUser().getLoginName());
+            tdPlaceRegist.setCreateTime(new Date());
+        }
+        return placeRegistService.saveOrUpdate(tdPlaceRegist);
+    }
+
+
+    public TdPlaceRegist selectTdPlaceRegist(String id) {
+        return placeRegistService.getById(id);
+    }
+
+    public boolean deleteTdPlaceRegistByids(String ids) {
+        List<String> list = Arrays.asList(Convert.toStrArray(ids));
+        return placeRegistService.removeByIds(list);
+    }
+
+
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/place/TdPlaceRegistController.java

@@ -1,11 +1,19 @@
 package com.ruoyi.web.controller.place;
 
+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.place.TdPlaceRegist;
 import com.ruoyi.web.controller.manager.TdPlaceRegistManager;
+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;
 
 /**
  * packageName com.ruoyi.web.controller.place
@@ -21,8 +29,95 @@ import javax.annotation.Resource;
 public class TdPlaceRegistController extends BaseController {
 
 
+    private String prefix = "system/placeRegist";
+
+
     @Resource
     private TdPlaceRegistManager placeRegistManager;
 
 
+    @RequiresPermissions("system:placeRegist:view")
+    @GetMapping()
+    public String placeRegist() {
+        return prefix + "/placeRegist";
+    }
+
+    /**
+     * 场所出入登记列表
+     */
+    @RequiresPermissions("system:placeRegist:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(TdPlaceRegist tdPlaceRegist) {
+        startPage();
+        List<TdPlaceRegist> tdPlaceRegists = placeRegistManager.selectTdPlaceRegistList(tdPlaceRegist);
+        return getDataTable(tdPlaceRegists);
+    }
+
+
+    /**
+     * 新增场所出入登记
+     */
+    @GetMapping("/add")
+    public String add() {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增场所出入登记
+     */
+    @RequiresPermissions("system:placeRegist:add")
+    @Log(title = "场所出入登记", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(TdPlaceRegist tdPlaceRegist) {
+        return toAjax(placeRegistManager.saveOrUpdate(tdPlaceRegist));
+    }
+
+    /**
+     * 修改场所出入登记
+     */
+    @RequiresPermissions("system:placeRegist:edit")
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") String id, ModelMap mmap) {
+        TdPlaceRegist tdPlaceRegist = placeRegistManager.selectTdPlaceRegist(id);
+        mmap.put("tdPlaceRegist", tdPlaceRegist);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改出入登记
+     */
+    @RequiresPermissions("system:placeRegist:edit")
+    @Log(title = "场所出入登记", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(TdPlaceRegist tdPlaceRegist) {
+        return toAjax(placeRegistManager.saveOrUpdate(tdPlaceRegist));
+    }
+
+    /**
+     * 详情场所出入登记
+     */
+    @RequiresPermissions("system:placeRegist:detail")
+    @GetMapping("/detail/{id}")
+    public String detail(@PathVariable("id") String id, ModelMap mmap) {
+        TdPlaceRegist tdPlaceRegist = placeRegistManager.selectTdPlaceRegist(id);
+        mmap.put("tdPlaceRegist", tdPlaceRegist);
+        return prefix + "/detail";
+    }
+
+    /**
+     * 删除场所出入登记
+     */
+    @RequiresPermissions("system:placeRegist:remove")
+    @Log(title = "场所出入登记", businessType = BusinessType.DELETE)
+    @PostMapping("/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids) {
+        return toAjax(placeRegistManager.deleteTdPlaceRegistByids(ids));
+    }
+
+
+
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/place/TdPlaceRegistMapper.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.place.TdPlaceRegist;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
 * @author 13560
 * @description 针对表【td_place_regist(涉密场所出入登记)】的数据库操作Mapper
@@ -13,6 +15,9 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TdPlaceRegistMapper extends BaseMapper<TdPlaceRegist> {
 
+
+    public List<TdPlaceRegist> selectTdPlaceRegistList(TdPlaceRegist tdPlaceRegist);
+
 }
 
 

ruoyi-system/src/main/java/com/ruoyi/system/service/place/TdPlaceRegistService.java

@@ -1,8 +1,11 @@
 package com.ruoyi.system.service.place;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.system.domain.place.TdPlace;
 import com.ruoyi.system.domain.place.TdPlaceRegist;
 
+import java.util.List;
+
 /**
 * @author 13560
 * @description 针对表【td_place_regist(涉密场所出入登记)】的数据库操作Service
@@ -10,4 +13,7 @@ import com.ruoyi.system.domain.place.TdPlaceRegist;
 */
 public interface TdPlaceRegistService extends IService<TdPlaceRegist> {
 
+
+    public List<TdPlaceRegist> selectTdPlaceRegistList(TdPlaceRegist tdPlaceRegist);
+
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/place/impl/TdPlaceRegistServiceImpl.java

@@ -2,10 +2,14 @@ package com.ruoyi.system.service.place.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.system.domain.place.TdPlaceRegist;
+import com.ruoyi.system.mapper.place.TdPlaceMapper;
 import com.ruoyi.system.mapper.place.TdPlaceRegistMapper;
 import com.ruoyi.system.service.place.TdPlaceRegistService;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.List;
+
 /**
 * @author 13560
 * @description 针对表【td_place_regist(涉密场所出入登记)】的数据库操作Service实现
@@ -15,6 +19,14 @@ import org.springframework.stereotype.Service;
 public class TdPlaceRegistServiceImpl extends ServiceImpl<TdPlaceRegistMapper, TdPlaceRegist>
     implements TdPlaceRegistService {
 
+    @Resource
+    private TdPlaceRegistMapper tdPlaceRegistMapper;
+
+
+    @Override
+    public List<TdPlaceRegist> selectTdPlaceRegistList(TdPlaceRegist tdPlaceRegist) {
+        return tdPlaceRegistMapper.selectTdPlaceRegistList(tdPlaceRegist);
+    }
 }
 
 

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

@@ -29,4 +29,20 @@
         dept_id,create_by,create_time,
         update_by,update_time,remark
     </sql>
+    <select id="selectTdPlaceRegistList" resultType="com.ruoyi.system.domain.place.TdPlaceRegist">
+        select  <include refid="Base_Column_List"/> from  td_place_regist
+        <trim prefix="where" prefixOverrides="and|or">
+            <if test="placeName!=null and placeName!=''">
+                AND place_name LIKE concat('%',#{placeName},'%')
+            </if>
+            <if test="registName!=null and registName!=''">
+                AND regist_name LIKE concat('%',#{registName},'%')
+            </if>
+            <if test="registTime!=null">
+                AND regist_time = #{registTime}
+            </if>
+        </trim>
+        ORDER BY create_time DESC
+
+    </select>
 </mapper>