Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/info/UserNucleicTimeController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.web.controller.info;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+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.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.UserNucleicTime;
+import com.ruoyi.system.service.IUserNucleicTimeService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 导入人员核酸时间记录Controller
+ * 
+ * @author ruoyi
+ * @date 2022-08-15
+ */
+@RestController
+@RequestMapping("/system/time")
+public class UserNucleicTimeController extends BaseController
+{
+    @Autowired
+    private IUserNucleicTimeService userNucleicTimeService;
+
+    /**
+     * 查询导入人员核酸时间记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:time:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(UserNucleicTime userNucleicTime)
+    {
+        startPage();
+        List<UserNucleicTime> list = userNucleicTimeService.selectUserNucleicTimeList(userNucleicTime);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出导入人员核酸时间记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:time:export')")
+    @Log(title = "导入人员核酸时间记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, UserNucleicTime userNucleicTime)
+    {
+        List<UserNucleicTime> list = userNucleicTimeService.selectUserNucleicTimeList(userNucleicTime);
+        ExcelUtil<UserNucleicTime> util = new ExcelUtil<UserNucleicTime>(UserNucleicTime.class);
+        util.exportExcel(response, list, "导入人员核酸时间记录数据");
+    }
+
+    /**
+     * 获取导入人员核酸时间记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:time:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(userNucleicTimeService.selectUserNucleicTimeById(id));
+    }
+
+    /**
+     * 新增导入人员核酸时间记录
+     */
+    @PreAuthorize("@ss.hasPermi('system:time:add')")
+    @Log(title = "导入人员核酸时间记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody UserNucleicTime userNucleicTime)
+    {
+        return toAjax(userNucleicTimeService.insertUserNucleicTime(userNucleicTime));
+    }
+
+    /**
+     * 修改导入人员核酸时间记录
+     */
+    @PreAuthorize("@ss.hasPermi('system:time:edit')")
+    @Log(title = "导入人员核酸时间记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody UserNucleicTime userNucleicTime)
+    {
+        return toAjax(userNucleicTimeService.updateUserNucleicTime(userNucleicTime));
+    }
+
+    /**
+     * 删除导入人员核酸时间记录
+     */
+    @PreAuthorize("@ss.hasPermi('system:time:remove')")
+    @Log(title = "导入人员核酸时间记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(userNucleicTimeService.deleteUserNucleicTimeByIds(ids));
+    }
+}

ruoyi-admin/src/main/resources/application-druid.yml

@@ -80,7 +80,7 @@ spring:
         # 端口，默认为6379
         port: 6379
         # 数据库索引
-        database: 8
+        database: 9
         # 密码
         password: Boman123
         # 连接超时时间

ruoyi-admin/src/main/resources/application-prod.yml

@@ -81,7 +81,7 @@ spring:
         # 端口，默认为6379
         port: 6379
         # 数据库索引
-        database: 8
+        database: 9
         # 密码
         password: 3r263Tr$
         # 连接超时时间

ruoyi-system/src/main/java/com/ruoyi/system/service/IUserNucleicTimeService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.UserNucleicTime;
+
+/**
+ * 导入人员核酸时间记录Service接口
+ * 
+ * @author ruoyi
+ * @date 2022-08-15
+ */
+public interface IUserNucleicTimeService 
+{
+    /**
+     * 查询导入人员核酸时间记录
+     * 
+     * @param id 导入人员核酸时间记录主键
+     * @return 导入人员核酸时间记录
+     */
+    public UserNucleicTime selectUserNucleicTimeById(Long id);
+
+    /**
+     * 查询导入人员核酸时间记录列表
+     * 
+     * @param userNucleicTime 导入人员核酸时间记录
+     * @return 导入人员核酸时间记录集合
+     */
+    public List<UserNucleicTime> selectUserNucleicTimeList(UserNucleicTime userNucleicTime);
+
+    /**
+     * 新增导入人员核酸时间记录
+     * 
+     * @param userNucleicTime 导入人员核酸时间记录
+     * @return 结果
+     */
+    public int insertUserNucleicTime(UserNucleicTime userNucleicTime);
+
+    /**
+     * 修改导入人员核酸时间记录
+     * 
+     * @param userNucleicTime 导入人员核酸时间记录
+     * @return 结果
+     */
+    public int updateUserNucleicTime(UserNucleicTime userNucleicTime);
+
+    /**
+     * 批量删除导入人员核酸时间记录
+     * 
+     * @param ids 需要删除的导入人员核酸时间记录主键集合
+     * @return 结果
+     */
+    public int deleteUserNucleicTimeByIds(Long[] ids);
+
+    /**
+     * 删除导入人员核酸时间记录信息
+     * 
+     * @param id 导入人员核酸时间记录主键
+     * @return 结果
+     */
+    public int deleteUserNucleicTimeById(Long id);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserNucleicTimeServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.UserNucleicTimeMapper;
+import com.ruoyi.system.domain.UserNucleicTime;
+import com.ruoyi.system.service.IUserNucleicTimeService;
+
+/**
+ * 导入人员核酸时间记录Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2022-08-15
+ */
+@Service
+public class UserNucleicTimeServiceImpl implements IUserNucleicTimeService 
+{
+    @Autowired
+    private UserNucleicTimeMapper userNucleicTimeMapper;
+
+    /**
+     * 查询导入人员核酸时间记录
+     * 
+     * @param id 导入人员核酸时间记录主键
+     * @return 导入人员核酸时间记录
+     */
+    @Override
+    public UserNucleicTime selectUserNucleicTimeById(Long id)
+    {
+        return userNucleicTimeMapper.selectUserNucleicTimeById(id);
+    }
+
+    /**
+     * 查询导入人员核酸时间记录列表
+     * 
+     * @param userNucleicTime 导入人员核酸时间记录
+     * @return 导入人员核酸时间记录
+     */
+    @Override
+    public List<UserNucleicTime> selectUserNucleicTimeList(UserNucleicTime userNucleicTime)
+    {
+        return userNucleicTimeMapper.selectUserNucleicTimeList(userNucleicTime);
+    }
+
+    /**
+     * 新增导入人员核酸时间记录
+     * 
+     * @param userNucleicTime 导入人员核酸时间记录
+     * @return 结果
+     */
+    @Override
+    public int insertUserNucleicTime(UserNucleicTime userNucleicTime)
+    {
+        return userNucleicTimeMapper.insertUserNucleicTime(userNucleicTime);
+    }
+
+    /**
+     * 修改导入人员核酸时间记录
+     * 
+     * @param userNucleicTime 导入人员核酸时间记录
+     * @return 结果
+     */
+    @Override
+    public int updateUserNucleicTime(UserNucleicTime userNucleicTime)
+    {
+        return userNucleicTimeMapper.updateUserNucleicTime(userNucleicTime);
+    }
+
+    /**
+     * 批量删除导入人员核酸时间记录
+     * 
+     * @param ids 需要删除的导入人员核酸时间记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteUserNucleicTimeByIds(Long[] ids)
+    {
+        return userNucleicTimeMapper.deleteUserNucleicTimeByIds(ids);
+    }
+
+    /**
+     * 删除导入人员核酸时间记录信息
+     * 
+     * @param id 导入人员核酸时间记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteUserNucleicTimeById(Long id)
+    {
+        return userNucleicTimeMapper.deleteUserNucleicTimeById(id);
+    }
+}