Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev

ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/equManagement/EquSupplierController.java

@@ -88,7 +88,7 @@ public class EquSupplierController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('device:supplier:add')")
     @Log(title = "供应商功能信息", businessType = BusinessType.INSERT)
-    @PostMapping
+    @PostMapping("/add")
     @ApiOperation("新增供应商功能信息")
     public AjaxResult add(@RequestBody EquSupplierAddDto dto)
     {
@@ -102,7 +102,7 @@ public class EquSupplierController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('device:supplier:edit')")
     @Log(title = "供应商功能信息", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PutMapping("/edit")
     @ApiOperation("修改供应商功能信息列表")
     public AjaxResult edit(@RequestBody EquSupplierUpdateDto updateDto) {
         return toAjax(equSupplierService.updateEquSupplier(updateDto));

ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquManu.java

@@ -50,7 +50,7 @@ public class EquManu
     private Long status;
 
     //@JsonIgnore
-    private Long createBy;   // 新增
+    private String createBy;   // 新增
 
     public EquManu() {}
 
@@ -144,11 +144,11 @@ public class EquManu
         return status;
     }
 
-    public Long getCreateBy() {
+    public String getCreateBy() {
         return createBy;
     }
 
-    public void setCreateBy(Long createBy) {
+    public void setCreateBy(String createBy) {
         this.createBy = createBy;
     }
 

ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquSupplier.java

@@ -41,8 +41,8 @@ public class EquSupplier
     @Excel(name = "l联系方式")
     private String contactWay;
     /** 联系人姓名 */
-    @Excel(name = "创建人id")
+    @Excel(name = "创建人")
-    private long createBy;
+    private String createBy;
 
 
 
@@ -117,12 +117,12 @@ public class EquSupplier
         return status;
     }
 
-    public Long getCreateBy()
+    public String getCreateBy()
     {
         return createBy;
     }
 
-    public void setCreateBy(Long createBy)
+    public void setCreateBy(String createBy)
     {
         this.createBy = createBy;
     }

ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquType.java

@@ -43,7 +43,7 @@ public class EquType
     private Date createDate;
 
     //@JsonIgnore
-    private Long createBy;
+    private String createBy;
 
     public EquType() {}
 
@@ -106,11 +106,11 @@ public class EquType
         return createDate;
     }
 
-    public Long getCreateBy() {
+    public String getCreateBy() {
         return createBy;
     }
 
-    public void setCreateBy(Long createBy) {
+    public void setCreateBy(String createBy) {
         this.createBy = createBy;
     }
 

ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/impl/EquManuServiceImpl.java

@@ -59,8 +59,8 @@ public class EquManuServiceImpl implements IEquManuService
     {
         equManu.setId(UUID.randomUUID().toString());
         equManu.setCreateDate(new Date());
-        Long userId = SecurityUtils.getLoginUser().getUserId();
+        String userName = SecurityUtils.getLoginUser().getUser().getUserName();
-        equManu.setCreateBy(userId);
+        equManu.setCreateBy(userName);
         return equManuMapper.insertEquManu(equManu);
     }
 
@@ -73,8 +73,8 @@ public class EquManuServiceImpl implements IEquManuService
     @Override
     public int updateEquManu(EquManu equManu)
     {
-        Long userId = SecurityUtils.getLoginUser().getUserId();
+        String userName = SecurityUtils.getLoginUser().getUser().getUserName();
-        equManu.setCreateBy(userId);
+        equManu.setCreateBy(userName);
         return equManuMapper.updateEquManu(equManu);
     }
 

ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/impl/EquSupplierServiceImpl.java

@@ -75,8 +75,8 @@ public class EquSupplierServiceImpl implements IEquSupplierService
         equSupplier.setCreateTime(new Date()); // 自动生成创建时间
         equSupplier.setStatus(dto.getStatus());
 
-        Long userId = SecurityUtils.getLoginUser().getUserId();
+        String userName = SecurityUtils.getLoginUser().getUser().getUserName();
-        equSupplier.setCreateBy(userId);
+        equSupplier.setCreateBy(userName);
         return equSupplierMapper.insertEquSupplier(equSupplier);
     }
 
@@ -101,8 +101,8 @@ public class EquSupplierServiceImpl implements IEquSupplierService
         // 后端自动设置修改时间
         equSupplier.setCreateTime(new Date());
 
-        Long userId = SecurityUtils.getLoginUser().getUserId();
+        String userName = SecurityUtils.getLoginUser().getUser().getUserName();
-        equSupplier.setCreateBy(userId);
+        equSupplier.setCreateBy(userName);
         return equSupplierMapper.updateEquSupplier(equSupplier);
     }
 

ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/impl/EquTypeServiceImpl.java

@@ -56,8 +56,8 @@ public class EquTypeServiceImpl implements IEquTypeService
     public int insertEquType(EquType equType)
     {
         equType.setId(UUID.randomUUID().toString());
-        Long userId = SecurityUtils.getLoginUser().getUserId();
+        String userName = SecurityUtils.getLoginUser().getUser().getUserName();
-        equType.setCreateBy(userId);
+        equType.setCreateBy(userName);
         return equTypeMapper.insertEquType(equType);
     }
 
@@ -70,8 +70,8 @@ public class EquTypeServiceImpl implements IEquTypeService
     @Override
     public int updateEquType(EquType equType)
     {
-        Long userId = SecurityUtils.getLoginUser().getUserId();
+        String userName = SecurityUtils.getLoginUser().getUser().getUserName();
-        equType.setCreateBy(userId);
+        equType.setCreateBy(userName);
         return equTypeMapper.updateEquType(equType);
     }
 

ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquManuMapper.xml

@@ -32,11 +32,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="description != null  and description != ''"> and description = #{description}</if>
-            <if test="contactBy != null "> and contact_by = #{contactBy}</if>
+            <if test="contactBy != null "> and contact_by LIKE CONCAT('%', #{contactBy}, '%')</if>
             <if test="contactWay != null  and contactWay != ''"> and contact_way = #{contactWay}</if>
             <if test="createDate != null "> and create_date = #{createDate}</if>
             <if test="status != null "> and status = #{status}</if>
-            <if test="createBy != null "> and create_by = #{createBy}</if>
+            <if test="createBy != null "> and  create_by LIKE CONCAT('%', #{createBy}, '%')</if>
         </where>
     </select>
     

ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquSupplierMapper.xml

@@ -30,9 +30,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="description != null  and description != ''"> and description = #{description}</if>
-            <if test="contactBy != null  and contactBy != ''"> and contact_by = #{contactBy}</if>
+            <if test="contactBy != null  and contactBy != ''"> and contact_by LIKE CONCAT('%', #{contactBy}, '%')</if>
             <if test="contactWay != null  and contactWay != ''"> and contact_way = #{contactWay}</if>
             <if test="status != null "> and status = #{status}</if>
+            <if test="createBy != null  and createBy != ''"> and create_by LIKE CONCAT('%', #{createBy}, '%')</if>
         </where>
     </select>
     

ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquTypeMapper.xml

@@ -33,6 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="description != null  and description != ''"> and description = #{description}</if>
             <if test="image != null  and image != ''"> and image = #{image}</if>
             <if test="createDate != null "> and create_date = #{createDate}</if>
+            <if test="createBy != null "> and create_by LIKE CONCAT('%', #{createBy}, '%')</if>
         </where>
     </select>