win代码上传

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

@@ -3,9 +3,13 @@ package com.ruoyi.web.controller.system;
 import com.alibaba.fastjson.JSON;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.CxSelect;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.json.JSONObject;
 import com.ruoyi.common.json.JSONObject.JSONArray;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.service.IdentifierStatusService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Schedules;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -25,6 +29,11 @@ import java.util.List;
 @RequestMapping("/system/identifierStatus")
 public class IdentifierStatusController
 {
+
+    @Autowired
+    private IdentifierStatusService identifierStatusService;
+
+
     private String prefix = "/system/identifierStatus";
 
 
@@ -46,6 +55,11 @@ public class IdentifierStatusController
         return prefix + "/select";
     }
 
+
+    @PostMapping("/list")
+    public TableDataInfo list(){
+        return new TableDataInfo();
+    }
     /**
      * 时间轴
      */

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

@@ -38,7 +38,7 @@ public class NormalIdentifierController extends BaseController
     private String prefix = "system/normalIdentifier";
 
     @Autowired
-    private NormalIdentifierService normalIdentifierService;
+    private ISysIdentifierService identifierService;
 
     @GetMapping()
     public String identifier()
@@ -48,10 +48,10 @@ public class NormalIdentifierController extends BaseController
 
     @PostMapping("/list")
     @ResponseBody
-    public TableDataInfo list(NormalIdentifier normalIdentifier)
+    public TableDataInfo list(SysIdentifier identifier)
     {
         startPage();
-        List<NormalIdentifier> list = normalIdentifierService.selectNormalIdentifierList(normalIdentifier);
+        List<SysIdentifier> list = identifierService.selectNormalIdentifierList(identifier);
         return getDataTable(list);
     }
 
@@ -71,10 +71,10 @@ public class NormalIdentifierController extends BaseController
     @Log(title = "用户管理", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     @ResponseBody
-    public AjaxResult addSave(@Validated NormalIdentifier normalIdentifier)
+    public AjaxResult addSave(@Validated SysIdentifier identifier)
     {
-        normalIdentifier.setCreateBy(getLoginName());
+        identifier.setCreateBy(getLoginName());
-        return toAjax(normalIdentifierService.insertNormalIdentifier(normalIdentifier));
+        return toAjax(identifierService.insertNormalIdentifier(identifier));
     }
 
     /**
@@ -84,7 +84,7 @@ public class NormalIdentifierController extends BaseController
     @GetMapping("/edit/{id}")
     public String edit(@PathVariable("id") Long id, ModelMap mmap)
     {
-        mmap.put("normalIdentifier", normalIdentifierService.selectIdentifierById(id));
+        mmap.put("normalIdentifier", identifierService.selectNormalIdentifierById(id));
         return prefix + "/edit";
     }
 
@@ -94,10 +94,10 @@ public class NormalIdentifierController extends BaseController
 //    @RequiresPermissions("system:user:edit")
     @PostMapping("/edit")
     @ResponseBody
-    public AjaxResult editSave(@Validated NormalIdentifier normalIdentifier)
+    public AjaxResult editSave(@Validated SysIdentifier identifier)
     {
 
-        normalIdentifier.setUpdateBy(getLoginName());
+        identifier.setUpdateBy(getLoginName());
-        return toAjax(normalIdentifierService.updateUser(normalIdentifier));
+        return toAjax(identifierService.updateNormalIdentifier(identifier));
     }
 }

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

@@ -74,7 +74,7 @@ public class SysIdentifierController extends BaseController
     public AjaxResult addSave(@Validated SysIdentifier identifier)
     {
         identifier.setCreateBy(getLoginName());
-        return toAjax(iSysIdentifierService.insertRadar(identifier));
+        return toAjax(iSysIdentifierService.insertIdentifier(identifier));
     }
 
     /**

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

@@ -30,7 +30,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 /**
- * 用户信息
+ * 雷达配置
  * 
  * @author ruoyi
  */
@@ -40,22 +40,9 @@ public class SysRadarController extends BaseController
 {
     private String prefix = "system/radar";
 
-    @Autowired
+
-    private ISysUserService userService;
     @Autowired
     private ISysRadarService radarService;
-    @Autowired
-    private ISysRoleService roleService;
-    
-    @Autowired
-    private ISysDeptService deptService;
-
-    @Autowired
-    private ISysPostService postService;
-
-    @Autowired
-    private SysPasswordService passwordService;
-
     @GetMapping()
     public String user()
     {
@@ -71,54 +58,20 @@ public class SysRadarController extends BaseController
         return getDataTable(list);
     }
 
-    @Log(title = "用户管理", businessType = BusinessType.EXPORT)
-    @RequiresPermissions("system:user:export")
-    @PostMapping("/export")
-    @ResponseBody
-    public AjaxResult export(SysUser user)
-    {
-        List<SysUser> list = userService.selectUserList(user);
-        ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
-        return util.exportExcel(list, "用户数据");
-    }
-
-    @Log(title = "用户管理", businessType = BusinessType.IMPORT)
-    @RequiresPermissions("system:user:import")
-    @PostMapping("/importData")
-    @ResponseBody
-    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
-    {
-        ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
-        List<SysUser> userList = util.importExcel(file.getInputStream());
-        String message = userService.importUser(userList, updateSupport, getLoginName());
-        return AjaxResult.success(message);
-    }
-
-    @RequiresPermissions("system:user:view")
-    @GetMapping("/importTemplate")
-    @ResponseBody
-    public AjaxResult importTemplate()
-    {
-        ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
-        return util.importTemplateExcel("用户数据");
-    }
-
     /**
-     * 新增用户
+     * 新增雷达配置
      */
     @GetMapping("/add")
     public String add(ModelMap mmap)
     {
-        mmap.put("roles", roleService.selectRoleAll().stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
-        mmap.put("posts", postService.selectPostAll());
         return prefix + "/add";
     }
 
     /**
-     * 新增保存用户
+     * 新增保存雷达配置
      */
 //    @RequiresPermissions("system:user:add")
-    @Log(title = "用户管理", businessType = BusinessType.INSERT)
+    @Log(title = "雷达配置管理", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     @ResponseBody
     public AjaxResult addSave(@Validated SysRadar radar)
@@ -128,7 +81,7 @@ public class SysRadarController extends BaseController
     }
 
     /**
-     * 修改用户
+     * 修改雷达
      */
 //    @RequiresPermissions("system:user:edit")
     @GetMapping("/edit/{id}")
@@ -139,24 +92,10 @@ public class SysRadarController extends BaseController
     }
 
     /**
-     * 查询用户详细
+     * 修改保存雷达
-     */
-    @RequiresPermissions("system:user:list")
-    @GetMapping("/view/{userId}")
-    public String view(@PathVariable("userId") Long userId, ModelMap mmap)
-    {
-        userService.checkUserDataScope(userId);
-        mmap.put("user", userService.selectUserById(userId));
-        mmap.put("roleGroup", userService.selectUserRoleGroup(userId));
-        mmap.put("postGroup", userService.selectUserPostGroup(userId));
-        return prefix + "/view";
-    }
-
-    /**
-     * 修改保存用户
      */
 //    @RequiresPermissions("system:user:edit")
-    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
+    @Log(title = "雷达修改", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     @ResponseBody
     public AjaxResult editSave(@Validated SysRadar radar)
@@ -166,143 +105,4 @@ public class SysRadarController extends BaseController
         return toAjax(radarService.updateUser(radar));
     }
 
-    @RequiresPermissions("system:user:resetPwd")
-    @GetMapping("/resetPwd/{userId}")
-    public String resetPwd(@PathVariable("userId") Long userId, ModelMap mmap)
-    {
-        mmap.put("user", userService.selectUserById(userId));
-        return prefix + "/resetPwd";
-    }
-
-    @RequiresPermissions("system:user:resetPwd")
-    @Log(title = "重置密码", businessType = BusinessType.UPDATE)
-    @PostMapping("/resetPwd")
-    @ResponseBody
-    public AjaxResult resetPwdSave(SysUser user)
-    {
-        userService.checkUserAllowed(user);
-        userService.checkUserDataScope(user.getUserId());
-        user.setSalt(ShiroUtils.randomSalt());
-        user.setPassword(passwordService.encryptPassword(user.getLoginName(), user.getPassword(), user.getSalt()));
-        if (userService.resetUserPwd(user) > 0)
-        {
-            if (ShiroUtils.getUserId().longValue() == user.getUserId().longValue())
-            {
-                setSysUser(userService.selectUserById(user.getUserId()));
-            }
-            return success();
-        }
-        return error();
-    }
-
-    /**
-     * 进入授权角色页
-     */
-    @GetMapping("/authRole/{userId}")
-    public String authRole(@PathVariable("userId") Long userId, ModelMap mmap)
-    {
-        SysUser user = userService.selectUserById(userId);
-        // 获取用户所属的角色列表
-        List<SysRole> roles = roleService.selectRolesByUserId(userId);
-        mmap.put("user", user);
-        mmap.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
-        return prefix + "/authRole";
-    }
-
-    /**
-     * 用户授权角色
-     */
-    @RequiresPermissions("system:user:edit")
-    @Log(title = "用户管理", businessType = BusinessType.GRANT)
-    @PostMapping("/authRole/insertAuthRole")
-    @ResponseBody
-    public AjaxResult insertAuthRole(Long userId, Long[] roleIds)
-    {
-        userService.checkUserDataScope(userId);
-        userService.insertUserAuth(userId, roleIds);
-        AuthorizationUtils.clearAllCachedAuthorizationInfo();
-        return success();
-    }
-
-    @RequiresPermissions("system:user:remove")
-    @Log(title = "用户管理", businessType = BusinessType.DELETE)
-    @PostMapping("/remove")
-    @ResponseBody
-    public AjaxResult remove(String ids)
-    {
-        if (ArrayUtils.contains(Convert.toLongArray(ids), getUserId()))
-        {
-            return error("当前用户不能删除");
-        }
-        return toAjax(userService.deleteUserByIds(ids));
-    }
-
-    /**
-     * 校验用户名
-     */
-    @PostMapping("/checkLoginNameUnique")
-    @ResponseBody
-    public boolean checkLoginNameUnique(SysUser user)
-    {
-        return userService.checkLoginNameUnique(user);
-    }
-
-    /**
-     * 校验手机号码
-     */
-    @PostMapping("/checkPhoneUnique")
-    @ResponseBody
-    public boolean checkPhoneUnique(SysUser user)
-    {
-        return userService.checkPhoneUnique(user);
-    }
-
-    /**
-     * 校验email邮箱
-     */
-    @PostMapping("/checkEmailUnique")
-    @ResponseBody
-    public boolean checkEmailUnique(SysUser user)
-    {
-        return userService.checkEmailUnique(user);
-    }
-
-    /**
-     * 用户状态修改
-     */
-    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
-    @RequiresPermissions("system:user:edit")
-    @PostMapping("/changeStatus")
-    @ResponseBody
-    public AjaxResult changeStatus(SysUser user)
-    {
-        userService.checkUserAllowed(user);
-        userService.checkUserDataScope(user.getUserId());
-        return toAjax(userService.changeStatus(user));
-    }
-
-    /**
-     * 加载部门列表树
-     */
-    @RequiresPermissions("system:user:list")
-    @GetMapping("/deptTreeData")
-    @ResponseBody
-    public List<Ztree> deptTreeData()
-    {
-        List<Ztree> ztrees = deptService.selectDeptTree(new SysDept());
-        return ztrees;
-    }
-
-    /**
-     * 选择部门树
-     * 
-     * @param deptId 部门ID
-     */
-    @RequiresPermissions("system:user:list")
-    @GetMapping("/selectDeptTree/{deptId}")
-    public String selectDeptTree(@PathVariable("deptId") Long deptId, ModelMap mmap)
-    {
-        mmap.put("dept", deptService.selectDeptById(deptId));
-        return prefix + "/deptTree";
-    }
 }

ruoyi-admin/src/main/resources/templates/system/normalIdentifier/add.html

@@ -12,7 +12,7 @@
                     <div class="form-group">
                         <label class="col-sm-4 control-label is-required">标识器ID1：</label>
                         <div class="col-sm-8">
-                            <input name="normalId" placeholder="请输入常温标识器ID1" class="form-control" type="text" maxlength="30" required>
+                            <input name="identifierId" placeholder="请输入常温标识器ID1" class="form-control" type="text" maxlength="30" required>
                         </div>
                     </div>
                 </div>
@@ -22,7 +22,7 @@
                     <div class="form-group">
                         <label class="col-sm-4 control-label is-required">标识器ID2：</label>
                         <div class="col-sm-8">
-                            <input name="normalTwo" placeholder="请输入常温标识器ID2" class="form-control" type="text" maxlength="30" required>
+                            <input name="identifierTwo" placeholder="请输入常温标识器ID2" class="form-control" type="text" maxlength="30" required>
                         </div>
                     </div>
                 </div>
@@ -32,7 +32,7 @@
                     <div class="form-group">
                         <label class="col-sm-4 control-label is-required">标识器ID3：</label>
                         <div class="col-sm-8">
-                            <input name="normalThree" placeholder="请输入常温标识器ID3" class="form-control" type="text" maxlength="30" required>
+                            <input name="identifierThree" placeholder="请输入常温标识器ID3" class="form-control" type="text" maxlength="30" required>
                         </div>
                     </div>
                 </div>
@@ -42,7 +42,7 @@
                     <div class="form-group">
                         <label class="col-sm-4 control-label is-required">标识器ID4：</label>
                         <div class="col-sm-8">
-                            <input name="normalFour" placeholder="请输入常温标识器ID4" class="form-control" type="text" maxlength="30" required>
+                            <input name="identifierFour" placeholder="请输入常温标识器ID4" class="form-control" type="text" maxlength="30" required>
                         </div>
                     </div>
                 </div>
@@ -52,7 +52,7 @@
                     <div class="form-group">
                         <label class="col-sm-4 control-label is-required">铁包号：</label>
                         <div class="col-sm-8">
-                            <input name="normalNumber" placeholder="请输入铁包号" class="form-control" type="text" maxlength="30" required>
+                            <input name="ladleNumber" placeholder="请输入铁包号" class="form-control" type="text" maxlength="30" required>
                         </div>
                     </div>
                 </div>

ruoyi-admin/src/main/resources/templates/system/normalIdentifier/edit.html

@@ -13,7 +13,7 @@
                     <div class="form-group">
                         <label class="col-sm-4 control-label is-required">标识器ID1：</label>
                         <div class="col-sm-8">
-                            <input name="normalId" placeholder="请输入常温标识器ID1" class="form-control" type="text" maxlength="30" th:field="*{normalId}" required>
+                            <input name="identifierId" placeholder="请输入常温标识器ID1" class="form-control" type="text" maxlength="30" th:field="*{identifierId}" required>
                         </div>
                     </div>
                 </div>
@@ -23,7 +23,7 @@
                     <div class="form-group">
                         <label class="col-sm-4 control-label is-required">标识器ID2：</label>
                         <div class="col-sm-8">
-                            <input name="normalTwo" placeholder="请输入常温标识器ID2" class="form-control" type="text" maxlength="30" th:field="*{normalTwo}" required>
+                            <input name="identifierTwo" placeholder="请输入常温标识器ID2" class="form-control" type="text" maxlength="30" th:field="*{identifierTwo}" required>
                         </div>
                     </div>
                 </div>
@@ -33,7 +33,7 @@
                     <div class="form-group">
                         <label class="col-sm-4 control-label is-required">标识器ID3：</label>
                         <div class="col-sm-8">
-                            <input name="normalThree" placeholder="请输入常温标识器ID3" class="form-control" type="text" maxlength="30" th:field="*{normalThree}" required>
+                            <input name="identifierThree" placeholder="请输入常温标识器ID3" class="form-control" type="text" maxlength="30" th:field="*{identifierThree}" required>
                         </div>
                     </div>
                 </div>
@@ -43,7 +43,7 @@
                     <div class="form-group">
                         <label class="col-sm-4 control-label is-required">标识器ID4：</label>
                         <div class="col-sm-8">
-                            <input name="normalFour" placeholder="请输入常温标识器ID4" class="form-control" type="text" maxlength="30" th:field="*{normalFour}" required>
+                            <input name="identifierFour" placeholder="请输入常温标识器ID4" class="form-control" type="text" maxlength="30" th:field="*{identifierFour}" required>
                         </div>
                     </div>
                 </div>
@@ -53,7 +53,7 @@
                     <div class="form-group">
                         <label class="col-sm-4 control-label is-required">铁包号：</label>
                         <div class="col-sm-8">
-                            <input name="normalNumber" placeholder="请输入铁包号" class="form-control" type="text" maxlength="30" th:field="*{normalNumber}" required>
+                            <input name="ladleNumber" placeholder="请输入铁包号" class="form-control" type="text" maxlength="30" th:field="*{ladleNumber}" required>
                         </div>
                     </div>
                 </div>
@@ -61,10 +61,6 @@
         </form>
     </div>
     <div class="row">
-<!--        <div class="col-sm-offset-5 col-sm-10">-->
-<!--            <button type="button" class="btn btn-sm btn-primary" onclick="submitHandler()"><i class="fa fa-check"></i>保 存</button>&nbsp;-->
-<!--            <button type="button" class="btn btn-sm btn-danger" onclick="closeItem()"><i class="fa fa-reply-all"></i>关 闭 </button>-->
-<!--        </div>-->
     </div>
 	<th:block th:include="include :: footer" />
 	<th:block th:include="include :: select2-js" />

ruoyi-admin/src/main/resources/templates/system/normalIdentifier/normalIdentifier.html

@@ -14,10 +14,10 @@
                     <div class="select-list">
                         <ul>
                             <li>
-                                雷达位置：<input type="text" name="normalId"/>
+                                雷达位置：<input type="text" name="identifierId"/>
                             </li>
                             <li>
-                                铁包号：<input type="text" name="normalNumber"/>
+                                铁包号：<input type="text" name="ladleNumber"/>
                             </li>
                             <li>
                                 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
@@ -87,27 +87,24 @@
                     title: '序号'
                 },
                 {
-                    field: 'normalId',
+                    field: 'identifierId',
                     title: '常温温标识器ID1',
                     sortable: true,
-                    // formatter: function (value, row, index) {
-                    //     // return '<a href="javascript:void(0)" onclick="$.operate.view(\'' + row.userId + '\')">' + value + '</a>';
-                    // }
                 },
                 {
-                    field: 'normalTwo',
+                    field: 'identifierTwo',
                     title: '常温标识器ID2'
                 },
                 {
-                    field: 'normalThree',
+                    field: 'identifierThree',
                     title: '常温标识器ID3'
                 },
                 {
-                    field: 'normalFour',
+                    field: 'identifierFour',
                     title: '常温标识器ID4'
                 },
                 {
-                    field: 'normalNumber',
+                    field: 'ladleNumber',
                     title: '铁包号'
                 },
                 {
@@ -117,11 +114,6 @@
                         if (row.userId != 1) {
                             var actions = [];
                             actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                            // actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.userId + '\')"><i class="fa fa-remove"></i>删除</a> ');
-                            // var more = [];
-                            // more.push("<a class='btn btn-default btn-xs " + resetPwdFlag + "' href='javascript:void(0)' onclick='resetPwd(" + row.userId + ")'><i class='fa fa-key'></i>重置密码</a> ");
-                            // more.push("<a class='btn btn-default btn-xs " + editFlag + "' href='javascript:void(0)' onclick='authRole(" + row.userId + ")'><i class='fa fa-check-square-o'></i>分配角色</a>");
-                            // actions.push('<a tabindex="0" class="btn btn-info btn-xs" role="button" data-container="body" data-placement="left" data-toggle="popover" data-html="true" data-trigger="hover" data-content="' + more.join('') + '"><i class="fa fa-chevron-circle-right"></i>更多操作</a>');
                             return actions.join('');
                         } else {
                             return "";

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysIdentifier.java

@@ -23,6 +23,13 @@ public class SysIdentifier extends BaseEntity
 
     private String identifierTwo;
 
+    private String identifierThree;
+
+    private String identifierFour;
+
+    private Integer type;
+
+
     private String ladleNumber;
 
     /** 删除标志（0代表存在 2代表删除） */
@@ -55,6 +62,30 @@ public class SysIdentifier extends BaseEntity
         this.identifierTwo = identifierTwo;
     }
 
+    public String getIdentifierThree() {
+        return identifierThree;
+    }
+
+    public void setIdentifierThree(String identifierThree) {
+        this.identifierThree = identifierThree;
+    }
+
+    public String getIdentifierFour() {
+        return identifierFour;
+    }
+
+    public void setIdentifierFour(String identifierFour) {
+        this.identifierFour = identifierFour;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
     public String getLadleNumber() {
         return ladleNumber;
     }
@@ -78,6 +109,9 @@ public class SysIdentifier extends BaseEntity
                 .append("identifierId", getIdentifierId())
                 .append("identifierTwo", getIdentifierTwo())
                 .append("ladleNumber", getLadleNumber())
+                .append("identifierThree", getIdentifierThree())
+                .append("identifierFour",getIdentifierFour())
+                .append("type",getType())
                 .append("delFlag", getDelFlag())
                 .append("createBy", getCreateBy())
                 .append("createTime", getCreateTime())

ruoyi-system/src/main/java/com/ruoyi/system/mapper/IdentifierStatusMapper.java

@@ -0,0 +1,15 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.common.core.domain.entity.SysIdentifier;
+
+import java.util.List;
+
+/**
+ * 用户表 数据层
+ * 
+ * @author ruoyi
+ */
+public interface IdentifierStatusMapper
+{
+
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysIdentifierMapper.java

@@ -22,4 +22,12 @@ public interface SysIdentifierMapper
     SysIdentifier selectIdentifierById(Long id);
 
     int updateIdentifier(SysIdentifier identifier);
+
+    List<SysIdentifier> selectNormalIdentifierList(SysIdentifier identifier);
+
+    int insertNormalIdentifier(SysIdentifier identifier);
+
+    SysIdentifier selectNormalIdentifierById(Long id);
+
+    int updateNormalIdentifier(SysIdentifier identifier);
 }

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

@@ -16,9 +16,17 @@ public interface ISysIdentifierService
 {
     public List<SysIdentifier> selectIdentifierList(SysIdentifier identifier);
 
-    int insertRadar(SysIdentifier identifier);
+    int insertIdentifier(SysIdentifier identifier);
 
     SysIdentifier selectIdentifierById(Long id);
 
     int updateUser(SysIdentifier identifier);
+
+    List<SysIdentifier> selectNormalIdentifierList(SysIdentifier identifier);
+
+    int insertNormalIdentifier(SysIdentifier identifier);
+
+    SysIdentifier selectNormalIdentifierById(Long id);
+
+    int updateNormalIdentifier(SysIdentifier identifier);
 }

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

@@ -0,0 +1,14 @@
+package com.ruoyi.system.service;
+
+import com.ruoyi.common.core.domain.entity.SysIdentifier;
+
+import java.util.List;
+
+/**
+ *高温标识器 业务层
+ * 
+ * @author ruoyi
+ */
+public interface IdentifierStatusService
+{
+}

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

@@ -0,0 +1,25 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.common.core.domain.entity.SysIdentifier;
+import com.ruoyi.system.mapper.SysIdentifierMapper;
+import com.ruoyi.system.service.ISysIdentifierService;
+import com.ruoyi.system.service.IdentifierStatusService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.validation.Validator;
+import java.util.List;
+
+/**
+ * 雷达 业务层处理
+ * 
+ * @author ruoyi
+ */
+@Service
+public class IdentifierStatusServiceImpl implements IdentifierStatusService
+{
+    private static final Logger log = LoggerFactory.getLogger(IdentifierStatusServiceImpl.class);
+
+}

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

@@ -58,7 +58,7 @@ public class SysIdentifierServiceImpl implements ISysIdentifierService
     }
 
     @Override
-    public int insertRadar(SysIdentifier identifier) {
+    public int insertIdentifier(SysIdentifier identifier) {
         int rows = identifierMapper.insertIdentifier(identifier);
         return rows;
     }
@@ -68,6 +68,28 @@ public class SysIdentifierServiceImpl implements ISysIdentifierService
         return identifierMapper.updateIdentifier(identifier);
     }
 
+    @Override
+    public List<SysIdentifier> selectNormalIdentifierList(SysIdentifier identifier) {
+
+        return identifierMapper.selectNormalIdentifierList(identifier);
+    }
+
+    @Override
+    public int insertNormalIdentifier(SysIdentifier identifier) {
+        int rows = identifierMapper.insertNormalIdentifier(identifier);
+        return rows;
+    }
+
+    @Override
+    public SysIdentifier selectNormalIdentifierById(Long id) {
+        return identifierMapper.selectNormalIdentifierById(id);
+    }
+
+    @Override
+    public int updateNormalIdentifier(SysIdentifier identifier) {
+        return identifierMapper.updateNormalIdentifier(identifier);
+    }
+
     @Override
     public SysIdentifier selectIdentifierById(Long id) {
 

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

@@ -0,0 +1,7 @@
+<?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.ruoyi.system.mapper.IdentifierStatusMapper">
+	
+</mapper> 

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

@@ -8,6 +8,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<id     property="id"        column="id"         />
 		<result property="identifierId"        column="identifier_id"         />
 		<result property="identifierTwo"     column="identifier_two"      />
+		<result property="identifierThree"     column="identifier_three"      />
+		<result property="identifierFour"     column="identifier_four"      />
+		<result property="type"     column="type"      />
 		<result property="ladleNumber"      column="ladle_number"       />
 		<result property="createBy"      column="create_by"       />
 		<result property="createTime"    column="create_time"     />
@@ -19,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<select id="selectIdentifierList" resultMap="SysIdentifierResult">
 		select i.id,i.identifier_id,i.identifier_two,i.ladle_number,i.create_by,i.create_time,i.update_by,i.update_time,i.remark,i.del_flag from sys_identifier i
-		where i.del_flag = '0'
+		where i.del_flag = '0' and i.type = 0
 		<if test="ladleNumber != null and ladleNumber != ''">
 			AND i.ladle_number like concat('%',#{ladleNumber}, '%')
 		</if>
@@ -39,6 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="ladleNumber != null and ladleNumber != ''">ladle_number,</if>
 		<if test="createBy != null and createBy != ''">create_by,</if>
 		<if test="remark != null and remark != ''">remark,</if>
+		type,
 		create_time
 		)values(
 		<if test="id != null and id != 0">#{id},</if>
@@ -47,6 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="ladleNumber != null and ladleNumber != ''">#{ladleNumber},</if>
 		<if test="createBy != null and createBy != ''">#{createBy},#,</if>
 		<if test="remark != null and remark != ''">#{remark},</if>
+		0,
 		sysdate()
 		)
 	</insert>
@@ -68,145 +73,64 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where id = #{id}
 	</update>
 
+	<select id="selectNormalIdentifierList" resultMap="SysIdentifierResult">
+		select i.id,i.identifier_id,i.identifier_two,i.identifier_three,i.identifier_four,i.ladle_number,i.type,i.create_by,i.create_time,i.update_by,i.update_time,i.remark,i.del_flag from sys_identifier i
+		where i.del_flag = '0' and i.type = 1
+		<if test="ladleNumber != null and ladleNumber != ''">
+			AND i.ladle_number like concat('%',#{ladleNumber}, '%')
+		</if>
+		<if test="identifierId != null and identifierId != ''">
+			AND i.identifier_id like concat('%',#{identifierId}, '%') or
+			i.identifier_two like concat('%',#{identifierId}, '%')
+		</if>
+    </select>
+
+	<insert id="insertNormalIdentifier">
+		insert into sys_identifier(
+		<if test="id != null and id != 0">id,</if>
+		<if test="identifierId != null and identifierId != ''">identifier_id,</if>
+		<if test="identifierTwo != null and identifierTwo != ''">identifier_two,</if>
+		<if test="identifierThree != null and identifierThree != ''">identifier_three,</if>
+		<if test="identifierFour != null and identifierFour != ''">identifier_four,</if>
+		<if test="ladleNumber != null and ladleNumber != ''">ladle_number,</if>
+		<if test="createBy != null and createBy != ''">create_by,</if>
+		<if test="remark != null and remark != ''">remark,</if>
+		type,
+		create_time
+		)values(
+		<if test="id != null and id != 0">#{id},</if>
+		<if test="identifierId != null and identifierId != ''">#{identifierId},</if>
+		<if test="identifierTwo != null and identifierTwo != ''">#{identifierTwo},</if>
+		<if test="identifierThree != null and identifierThree != ''">#{identifierThree},</if>
+		<if test="identifierFour != null and identifierFour != ''">#{identifierFour},</if>
+		<if test="ladleNumber != null and ladleNumber != ''">#{ladleNumber},</if>
+		<if test="createBy != null and createBy != ''">#{createBy},#,</if>
+		<if test="remark != null and remark != ''">#{remark},</if>
+		1,
+		sysdate()
+		)
+	</insert>
+
+	<select id="selectNormalIdentifierById" resultMap="SysIdentifierResult">
+		select i.id,i.identifier_id,i.identifier_two,i.identifier_three,i.identifier_four,i.type,i.ladle_number,i.create_by,i.create_time,i.update_by,i.update_time,i.remark,i.del_flag from sys_identifier i where i.id = #{id}
+
+	</select>
+
+	<update id="updateNormalIdentifier">
+
+		update sys_identifier
+		<set>
+			<if test="identifierId != null and identifierId != ''">identifier_id = #{identifierId},</if>
+			<if test="identifierTwo != null and identifierTwo != ''">identifier_two = #{identifierTwo},</if>
+			<if test="identifierThree != null and identifierThree != ''">identifier_three = #{identifierThree},</if>
+			<if test="identifierFour != null and identifierFour != ''">identifier_four = #{identifierFour},</if>
+			<if test="ladleNumber != null and ladleNumber != ''">ladle_number = #{ladleNumber},</if>
+			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+			<if test="remark != null">remark = #{remark},</if>
+			update_time = sysdate()
+		</set>
+		where id = #{id}
+	</update>
 
-	<!--	<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">-->
-<!--	    select distinct u.user_id, u.dept_id, u.login_name, u.user_name, u.user_type, u.email, u.avatar, u.phonenumber, u.status, u.create_time-->
-<!--	    from sys_user u-->
-<!--			 left join sys_dept d on u.dept_id = d.dept_id-->
-<!--			 left join sys_user_role ur on u.user_id = ur.user_id-->
-<!--			 left join sys_role r on r.role_id = ur.role_id-->
-<!--	    where u.del_flag = '0' and r.role_id = #{roleId}-->
-<!--	    <if test="loginName != null and loginName != ''">-->
-<!--			AND u.login_name like concat('%', #{loginName}, '%')-->
-<!--		</if>-->
-<!--		<if test="phonenumber != null and phonenumber != ''">-->
-<!--			AND u.phonenumber like concat('%', #{phonenumber}, '%')-->
-<!--		</if>-->
-<!--		&lt;!&ndash; 数据范围过滤 &ndash;&gt;-->
-<!--		${params.dataScope}-->
-<!--	</select>-->
-<!--	-->
-<!--	<select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">-->
-<!--	    select distinct u.user_id, u.dept_id, u.login_name, u.user_name, u.user_type, u.email, u.avatar, u.phonenumber, u.status, u.create_time-->
-<!--	    from sys_user u-->
-<!--			 left join sys_dept d on u.dept_id = d.dept_id-->
-<!--			 left join sys_user_role ur on u.user_id = ur.user_id-->
-<!--			 left join sys_role r on r.role_id = ur.role_id-->
-<!--	    where u.del_flag = '0' and (r.role_id != #{roleId} or r.role_id IS NULL)-->
-<!--	    and u.user_id not in (select u.user_id from sys_user u inner join sys_user_role ur on u.user_id = ur.user_id and ur.role_id = #{roleId})-->
-<!--	    <if test="loginName != null and loginName != ''">-->
-<!--			AND u.login_name like concat('%', #{loginName}, '%')-->
-<!--		</if>-->
-<!--		<if test="phonenumber != null and phonenumber != ''">-->
-<!--			AND u.phonenumber like concat('%', #{phonenumber}, '%')-->
-<!--		</if>-->
-<!--		&lt;!&ndash; 数据范围过滤 &ndash;&gt;-->
-<!--		${params.dataScope}-->
-<!--	</select>-->
-<!--	-->
-<!--	<select id="selectUserByLoginName" parameterType="String" resultMap="SysUserResult">-->
-<!--	    <include refid="selectUserVo"/>-->
-<!--		where u.login_name = #{userName} and u.del_flag = '0'-->
-<!--	</select>-->
-<!--	-->
-<!--	<select id="selectUserByPhoneNumber" parameterType="String" resultMap="SysUserResult">-->
-<!--		<include refid="selectUserVo"/>-->
-<!--		where u.phonenumber = #{phonenumber} and u.del_flag = '0'-->
-<!--	</select>-->
-<!--	-->
-<!--	<select id="selectUserByEmail" parameterType="String" resultMap="SysUserResult">-->
-<!--	    <include refid="selectUserVo"/>-->
-<!--		where u.email = #{email} and u.del_flag = '0'-->
-<!--	</select>-->
-<!--	-->
-<!--	<select id="checkLoginNameUnique" parameterType="String" resultMap="SysUserResult">-->
-<!--		select user_id, login_name from sys_user where login_name=#{loginName} and del_flag = '0' limit 1-->
-<!--	</select>-->
-<!--	-->
-<!--	<select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">-->
-<!--		select user_id, phonenumber from sys_user where phonenumber=#{phonenumber} and del_flag = '0' limit 1-->
-<!--	</select>-->
-<!--	-->
-<!--	<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">-->
-<!--		select user_id, email from sys_user where email=#{email} and del_flag = '0' limit 1-->
-<!--	</select>-->
-<!--	-->
-<!--	<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">-->
-<!--		<include refid="selectUserVo"/>-->
-<!--		where u.user_id = #{userId}-->
-<!--	</select>-->
-<!--	-->
-<!--	<delete id="deleteUserById" parameterType="Long">-->
-<!-- 		update sys_user set del_flag = '2' where user_id = #{userId}-->
-<!-- 	</delete>-->
-<!-- 	-->
-<!-- 	<delete id="deleteUserByIds" parameterType="Long">-->
-<!-- 		update sys_user set del_flag = '2' where user_id in-->
-<!-- 		<foreach collection="array" item="userId" open="(" separator="," close=")">-->
-<!-- 			#{userId}-->
-<!--        </foreach> -->
-<!-- 	</delete>-->
-<!-- 	-->
-<!-- 	<update id="updateUser" parameterType="SysUser">-->
-<!-- 		update sys_user-->
-<!-- 		<set>-->
-<!-- 			<if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>-->
-<!-- 			<if test="loginName != null and loginName != ''">login_name = #{loginName},</if>-->
-<!-- 			<if test="userName != null and userName != ''">user_name = #{userName},</if>-->
-<!-- 			<if test="userType != null and userType != ''">user_type = #{userType},</if>-->
-<!-- 			<if test="email != null and email != ''">email = #{email},</if>-->
-<!-- 			<if test="phonenumber != null and phonenumber != ''">phonenumber = #{phonenumber},</if>-->
-<!-- 			<if test="sex != null and sex != ''">sex = #{sex},</if>-->
-<!-- 			<if test="avatar != null and avatar != ''">avatar = #{avatar},</if>-->
-<!-- 			<if test="password != null and password != ''">password = #{password},</if>-->
-<!-- 			<if test="salt != null and salt != ''">salt = #{salt},</if>-->
-<!-- 			<if test="status != null and status != ''">status = #{status},</if>-->
-<!-- 			<if test="loginIp != null and loginIp != ''">login_ip = #{loginIp},</if>-->
-<!-- 			<if test="loginDate != null">login_date = #{loginDate},</if>-->
-<!-- 			<if test="pwdUpdateDate != null">pwd_update_date = #{pwdUpdateDate},</if>-->
-<!-- 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>-->
-<!-- 			<if test="remark != null">remark = #{remark},</if>-->
-<!-- 			update_time = sysdate()-->
-<!-- 		</set>-->
-<!-- 		where user_id = #{userId}-->
-<!--	</update>-->
-<!-- 	-->
-<!-- 	<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">-->
-<!-- 		insert into sys_user(-->
-<!-- 			<if test="userId != null and userId != 0">user_id,</if>-->
-<!-- 			<if test="deptId != null and deptId != 0">dept_id,</if>-->
-<!-- 			<if test="loginName != null and loginName != ''">login_name,</if>-->
-<!-- 			<if test="userName != null and userName != ''">user_name,</if>-->
-<!-- 			<if test="userType != null and userType != ''">user_type,</if>-->
-<!-- 			<if test="email != null and email != ''">email,</if>-->
-<!-- 			<if test="avatar != null and avatar != ''">avatar,</if>-->
-<!-- 			<if test="phonenumber != null and phonenumber != ''">phonenumber,</if>-->
-<!-- 			<if test="sex != null and sex != ''">sex,</if>-->
-<!-- 			<if test="password != null and password != ''">password,</if>-->
-<!-- 			<if test="salt != null and salt != ''">salt,</if>-->
-<!-- 			<if test="status != null and status != ''">status,</if>-->
-<!-- 			<if test="pwdUpdateDate != null">pwd_update_date,</if>-->
-<!-- 			<if test="createBy != null and createBy != ''">create_by,</if>-->
-<!-- 			<if test="remark != null and remark != ''">remark,</if>-->
-<!-- 			create_time-->
-<!-- 		)values(-->
-<!-- 			<if test="userId != null and userId != ''">#{userId},</if>-->
-<!-- 			<if test="deptId != null and deptId != ''">#{deptId},</if>-->
-<!-- 			<if test="loginName != null and loginName != ''">#{loginName},</if>-->
-<!-- 			<if test="userName != null and userName != ''">#{userName},</if>-->
-<!-- 			<if test="userType != null and userType != ''">#{userType},</if>-->
-<!-- 			<if test="email != null and email != ''">#{email},</if>-->
-<!-- 			<if test="avatar != null and avatar != ''">#{avatar},</if>-->
-<!-- 			<if test="phonenumber != null and phonenumber != ''">#{phonenumber},</if>-->
-<!-- 			<if test="sex != null and sex != ''">#{sex},</if>-->
-<!-- 			<if test="password != null and password != ''">#{password},</if>-->
-<!-- 			<if test="salt != null and salt != ''">#{salt},</if>-->
-<!-- 			<if test="status != null and status != ''">#{status},</if>-->
-<!-- 			<if test="pwdUpdateDate != null">#{pwdUpdateDate},</if>-->
-<!-- 			<if test="createBy != null and createBy != ''">#{createBy},</if>-->
-<!-- 			<if test="remark != null and remark != ''">#{remark},</if>-->
-<!-- 			sysdate()-->
-<!-- 		)-->
-<!--	</insert>-->
 	
 </mapper>