refactor(device&member): ♻️ 重构部分查询逻辑

Author: david4958606

src/main/java/org/netunion/manager/controller/DeviceController.java

@@ -11,8 +11,8 @@
  * 设备控制器
  *
  * @author David Wang
- * @date 2022-07-07
- * @version 1.1
+ * @date 2022-07-08
+ * @version 2.0
  */
 @RestController
 public class DeviceController {
@@ -24,10 +24,10 @@ public List<Device> getDeviceList() {
         return deviceMapper.getAll();
     }
     // 获取指定设备信息 JSON 格式
-    @GetMapping("/device/{id}")
-    public Device getDevice(@PathVariable("id") int id) {
-        if (deviceMapper.getById(id) == null) return null;
-        else return deviceMapper.getById(id);
+    @GetMapping("/device/{name}")
+    public String getDevice(@PathVariable("name") String name) {
+        if (deviceMapper.getByName(name) == null) return "{\"error\": \"NO DEVICE\"}";
+        else return deviceMapper.getByName(name).toString();
     }
     //通过 POST 方式添加设备
     @PostMapping(value = "/device/add", produces = "application/json;charset=UTF-8")
@@ -36,62 +36,50 @@ public String addDevice(@RequestBody Device device) {
         return device.toString();
     }
     //通过 DELETE 方式删除设备
-    @DeleteMapping(value = "/device/delete/{id}")
-    public String deleteDevice(@PathVariable("id") int id) {
-        Device device = deviceMapper.getById(id);
+    @DeleteMapping(value = "/device/delete/{name}")
+    public String deleteDevice(@PathVariable("name") String name) {
+        Device device = deviceMapper.getByName(name);
         if (device != null){
-            deviceMapper.delete(id);
+            deviceMapper.delete(name);
             return device.toString();
         }
         else {
-            return "{\"error\": \"EMPTY ID\"}";
+            return "{\"error\": \"NO DEVICE\"}";
         }
     }
     //通过 POST 方式更新设备类型
     @PostMapping(value = "/device/update/type")
-    public String updateDeviceType(@RequestParam int id, @RequestParam String type) {
-        Device device = deviceMapper.getById(id);
+    public String updateDeviceType(@RequestParam String name, @RequestParam String deviceType) {
+        Device device = deviceMapper.getByName(name);
         if (device == null) {
-            return "{\"error\": \"EMPTY ID\"}";
+            return "{\"error\": \"NO DEVICE\"}";
         }
         else {
-            deviceMapper.updateDeviceTypeById(id, type);
+            deviceMapper.updateDeviceTypeByName(name, deviceType);
             return device.toString();
         }
     }
     //通过 POST 方式更新设备 manageIp
     @PostMapping(value = "/device/update/manageIp")
-    public String updateDeviceManageIp(@RequestParam int id, @RequestParam String manageIp) {
-        Device device = deviceMapper.getById(id);
+    public String updateDeviceManageIp(@RequestParam String name, @RequestParam String manageIp) {
+        Device device = deviceMapper.getByName(name);
         if (device == null) {
-            return "{\"error\": \"EMPTY ID\"}";
+            return "{\"error\": \"NO DEVICE\"}";
         }
         else {
-            deviceMapper.updateManageIpById(id, manageIp);
-            return device.toString();
-        }
-    }
-    //通过 POST 方式更新设备 name
-    @PostMapping(value = "/device/update/name")
-    public String updateDeviceName(@RequestParam int id, @RequestParam String name) {
-        Device device = deviceMapper.getById(id);
-        if (device == null) {
-            return "{\"error\": \"EMPTY ID\"}";
-        }
-        else {
-            deviceMapper.updateNameById(id, name);
+            deviceMapper.updateManageIpByName(name, manageIp);
             return device.toString();
         }
     }
     //通过 POST 方式更新设备 rackNo
     @PostMapping(value = "/device/update/rackNo")
-    public String updateDeviceRackNo(@RequestParam int id, @RequestParam int rackNo) {
-        Device device = deviceMapper.getById(id);
+    public String updateDeviceRackNo(@RequestParam String name, @RequestParam int rackNo) {
+        Device device = deviceMapper.getByName(name);
         if (device == null) {
-            return "{\"error\": \"EMPTY ID\"}";
+            return "{\"error\": \"NO DEVICE\"}";
         }
         else {
-            deviceMapper.updateRackNoById(id, rackNo);
+            deviceMapper.updateRackNoByName(name, rackNo);
             return device.toString();
         }
     }

src/main/java/org/netunion/manager/controller/MemberController.java

@@ -11,8 +11,8 @@
  * 成员页面控制器
  *
  * @author David Wang
- * @version 1.3
- * @date 2020-07-07
+ * @version 2.0
+ * @date 2020-07-08
  */
 @RestController
 public class MemberController {
@@ -24,10 +24,10 @@ public List<Member> getMemberList() {
         return memberMapper.getAll();
     }
     // 获取指定成员信息 JSON 格式
-    @GetMapping("/member/{id}")
-    public Member getMember(@PathVariable("id") int id) {
-        if (memberMapper.getById(id) == null) return null;
-        else return memberMapper.getById(id);
+    @GetMapping("/member/{studentId}")
+    public String getMember(@PathVariable("studentId") String studentId) {
+        if (memberMapper.getById(studentId) == null) return "{\"error\": \"NO MEMBER\"}";
+        else return memberMapper.getById(studentId).toString();
     }
     //通过 POST 方式添加成员
     @PostMapping(value = "/member/add", produces = "application/json;charset=UTF-8")
@@ -36,39 +36,39 @@ public String addMember(@RequestBody Member member) {
         return member.toString();
     }
     //通过 DELETE 方式删除成员
-    @DeleteMapping(value = "/member/delete/{id}")
-    public String deleteMember(@PathVariable("id") int id) {
-        Member member = memberMapper.getById(id);
+    @DeleteMapping(value = "/member/delete/{studentId}")
+    public String deleteMember(@PathVariable("studentId") String studentId) {
+        Member member = memberMapper.getById(studentId);
         if (member != null){
-            memberMapper.delete(id);
+            memberMapper.delete(studentId);
             return member.toString();
         }
         else {
-            return "{\"error\": \"EMPTY ID\"}";
+            return "{\"error\": \"NO MEMBER\"}";
         }
     }
     //通过 POST 方式更新成员银行卡号
     @PostMapping(value = "/member/update/bank")
-    public String updateMemberBankNum(@RequestParam int id, @RequestParam String bankNum) {
-        Member member = memberMapper.getById(id);
+    public String updateMemberBankNum(@RequestParam String studentId, @RequestParam String bankNum) {
+        Member member = memberMapper.getById(studentId);
         if (member == null) {
-            return "{\"error\": \"EMPTY ID\"}";
+            return "{\"error\": \"NO MEMBER\"}";
         }
         else {
-            memberMapper.updateBankNumById(id, bankNum);
+            memberMapper.updateBankNumById(studentId, bankNum);
             return member.toString();
         }
     }
     //通过 POST 方式更新成员手机号码
     @PostMapping(value = "/member/update/phone")
-    public String updateMemberPhoneNum(@RequestParam int id, @RequestParam String phoneNum) {
-        Member member = memberMapper.getById(id);
+    public String updateMemberPhoneNum(@RequestParam String studentId, @RequestParam String phoneNum) {
+        Member member = memberMapper.getById(studentId);
         //判空
         if (member == null) {
-            return "{\"error\": \"EMPTY ID\"}";
+            return "{\"error\": \"NO MEMBER\"}";
         }
         else {
-            memberMapper.updatePhoneNumById(id, phoneNum);
+            memberMapper.updatePhoneNumById(studentId, phoneNum);
             return member.toString();
         }
     }

src/main/java/org/netunion/manager/mapper/DeviceMapper.java

@@ -9,23 +9,22 @@
  * 设备 Mapper 接口
  *
  * @author David Wang
- * @date 2022-07-07
- * @version 1.0
+ * @date 2022-07-08
+ * @version 2.0
  */
 @Mapper
 public interface DeviceMapper {
     //增
     public int add(Device device);
     //删
-    public void delete(int id);
+    public void delete(String name);
     //改
     public void update(Device device);
-    public void updateDeviceTypeById(int id, String deviceType);
-    public void updateManageIpById(int id, String manageIp);
-    public void updateNameById(int id, String name);
-    public void updateRackNoById(int id, int rackNo);
+    public void updateDeviceTypeByName(String name, String deviceType);
+    public void updateManageIpByName(String name, String manageIp);
+    public void updateRackNoByName(String name, int rackNo);
     //查
     public List<Device> getAll();
-    public Device getById(int id);
+    public Device getByName(String name);
     public int count();
 }

src/main/java/org/netunion/manager/mapper/MemberMapper.java

@@ -9,22 +9,22 @@
  * 成员 Mapper 接口
  *
  * @author David Wang
- * @date 2022-07-06
- * @version 1.1
+ * @date 2022-07-08
+ * @version 2.0
  */
 @Mapper
 public interface MemberMapper {
     //增
     public int add(Member member);
     //删
-    public void delete(int id);
+    public void delete(String studentId);
     //改
     public void update(Member member);
-    public void updatePhoneNumById(int id, String phoneNum);
-    public void updateBankNumById(int id, String bankNum);
+    public void updatePhoneNumById(String studentId, String phoneNum);
+    public void updateBankNumById(String studentId, String bankNum);
     //查
     public List<Member> getAll();
-    public Member getById(int id);
+    public Member getById(String studentId);
 
     public int count();
 }

src/main/java/org/netunion/manager/pojo/Device.java

@@ -4,24 +4,15 @@
  * 设备 JavaBean
  *
  * @author David Wang
- * @date 2022-07-07
- * @version 1.0
+ * @date 2022-07-08
+ * @version 2.0
  */
 public class Device {
-    private int id;
     private String deviceType;
     private String manageIp;
     private String name;
     private int rackNo;
 
-    public int getId() {
-        return id;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
     public String getDeviceType() {
         return deviceType;
     }
@@ -57,8 +48,7 @@ public void setRackNo(int rackNo) {
     @Override
     public String toString() {
         return "{" +
-                "id=" + id +
-                ", deviceType='" + deviceType + '\'' +
+                "deviceType='" + deviceType + '\'' +
                 ", manageIp='" + manageIp + '\'' +
                 ", name='" + name + '\'' +
                 ", rackNo=" + rackNo +

src/main/java/org/netunion/manager/pojo/Member.java

@@ -4,26 +4,17 @@
  * 成员 JavaBean
  *
  * @author David Wang
- * @date 2022-07-06
- * @version 1.0
+ * @date 2022-07-08
+ * @version 2.0
  */
 public class Member {
-    private int id;
     private String name;
     private String studentId;
 
     private String phoneNum;
 
     private String bankNum;
 
-    public int getId() {
-        return id;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
     public String getName() {
         return name;
     }
@@ -59,8 +50,7 @@ public void setPhoneNum(String phoneNum) {
     @Override
     public String toString() {
         return "{" +
-                "id=" + id +
-                ", name='" + name + '\'' +
+                "name='" + name + '\'' +
                 ", studentId='" + studentId + '\'' +
                 ", phoneNum='" + phoneNum + '\'' +
                 ", bankNum='" + bankNum + '\'' +

src/main/resources/org/netunion/manager/mapper/DeviceMapper.xml

@@ -3,7 +3,6 @@
 
 <mapper namespace="org.netunion.manager.mapper.DeviceMapper">
     <resultMap id="DeviceResult" type="org.netunion.manager.pojo.Device">
-        <result property="id" column="id" />
         <result property="deviceType" column="device_type" />
         <result property="manageIp" column="manage_ip" />
         <result property="name" column="name" />
@@ -15,24 +14,21 @@
     </insert>
     <!--    删-->
     <delete id="delete" parameterType="org.netunion.manager.pojo.Device">
-        DELETE FROM "device" WHERE id = #{id}
+        DELETE FROM "device" WHERE name = #{name}
     </delete>
     <!--    改-->
-    <update id="updateDeviceTypeById" parameterType="org.netunion.manager.pojo.Device">
-        UPDATE "device" SET device_type = #{deviceType} WHERE id = #{id}
+    <update id="updateDeviceTypeByName" parameterType="org.netunion.manager.pojo.Device">
+        UPDATE "device" SET device_type = #{deviceType} WHERE name = #{name}
     </update>
-    <update id="updateManageIpById" parameterType="org.netunion.manager.pojo.Device">
-        UPDATE "device" SET manage_ip = #{manageIp} WHERE id = #{id}
+    <update id="updateManageIpByName" parameterType="org.netunion.manager.pojo.Device">
+        UPDATE "device" SET manage_ip = #{manageIp} WHERE name = #{name}
     </update>
-    <update id="updateNameById" parameterType="org.netunion.manager.pojo.Device">
-        UPDATE "device" SET name = #{name} WHERE id = #{id}
-    </update>
-    <update id="updateRackNoById" parameterType="org.netunion.manager.pojo.Device">
-        UPDATE "device" SET rack_no = #{rackNo} WHERE id = #{id}
+    <update id="updateRackNoByName" parameterType="org.netunion.manager.pojo.Device">
+        UPDATE "device" SET rack_no = #{rackNo} WHERE name = #{name}
     </update>
     <!--    查-->
-    <select id="getById" resultMap="DeviceResult" parameterType="org.netunion.manager.pojo.Device">
-        SELECT * FROM "device" WHERE id = #{id}
+    <select id="getByName" resultMap="DeviceResult" parameterType="org.netunion.manager.pojo.Device">
+        SELECT * FROM "device" WHERE name = #{name}
     </select>
     <select id="getAll" resultMap="DeviceResult" parameterType="org.netunion.manager.pojo.Device">
         SELECT * FROM "device"

src/main/resources/org/netunion/manager/mapper/MemberMapper.xml

@@ -15,18 +15,18 @@
     </insert>
 <!--    删-->
     <delete id="delete" parameterType="org.netunion.manager.pojo.Member">
-        DELETE FROM "member" WHERE id = #{id}
+        DELETE FROM "member" WHERE student_id = #{studentId}
     </delete>
 <!--    改-->
     <update id="updatePhoneNumById" parameterType="org.netunion.manager.pojo.Member">
-        UPDATE "member" SET phone_num = #{phoneNum} WHERE id = #{id}
+        UPDATE "member" SET phone_num = #{phoneNum} WHERE student_id = #{studentId}
     </update>
     <update id="updateBankNumById" parameterType="org.netunion.manager.pojo.Member">
-        UPDATE "member" SET bank_num = #{bankNum} WHERE id = #{id}
+        UPDATE "member" SET bank_num = #{bankNum} WHERE student_id = #{studentId}
     </update>
 <!--    查-->
     <select id="getById" resultMap="MemberResult" parameterType="org.netunion.manager.pojo.Member">
-        SELECT * FROM "member" WHERE id = #{id}
+        SELECT * FROM "member" WHERE student_id = #{studentId}
     </select>
     <select id="getAll" resultMap="MemberResult" parameterType="org.netunion.manager.pojo.Member">
         SELECT * FROM "member"