。。。。。

@@ -16,7 +16,7 @@ spring:
     static-locations: classpath:/META-INF/resources/,classpath:/static,classpath:/resources/,file:${web.upload-path}
 
   application:
-    name: tianbo.base.dev.devkit
+    name: hqpt-user-center
 
   jackson:
     serialization:

@@ -19,7 +19,9 @@ public class LogController {
     public PageInfo<LOGWithBLOBs> systemLog(@RequestParam(value = "pageNum",required = false,defaultValue = "1")
                                                int pageNum,
                                             @RequestParam(value = "pageSize",required = false,defaultValue = "5")
-                                               int pageSize){
-        return logService.selectAll(pageNum,pageSize);
+                                               int pageSize,
+                                            @RequestParam(value = "username", required = false) String username,
+                                            @RequestParam(value = "modelnamecn", required = false) String modelnamecn){
+        return logService.selectAll(pageNum,pageSize, username, modelnamecn);
     }
 }

@@ -12,33 +12,83 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 
 
 @RestController()
+@RequestMapping("/perm")
 public class PermssionController {
 
     @Autowired
     PermissionService permissionService;
 
-    @GetMapping("/perm/list")
+    @GetMapping("/list")
     public PageInfo<PERMISSION> list(@RequestParam(value = "pageNum",required = false,defaultValue = "1")
                                              int pageNum,
                                      @RequestParam(value = "pageSize",required = false,defaultValue = "5")
-                                             int pageSize){
-        return permissionService.findAll(pageNum,pageSize);
+                                             int pageSize,
+                                     @RequestParam(value = "name", required = false) String name){
+        return permissionService.findAll(pageNum,pageSize, name);
 
     }
 
     @LogAnnotation(moduleName = "权限管理",operate = "权限添加")
-    @PostMapping("/perm/add")
+    @PostMapping("/add")
     public ResultJson add(@RequestBody PERMISSION permission){
         int i =permissionService.insertSelective(permission);
 
         ResultJson resultJson = new ResultJson();
         if (1==i){
-            resultJson = new ResultJson("200","添加账户成功");
+            resultJson = new ResultJson("200","添加成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+    @LogAnnotation(moduleName = "权限管理",operate = "权限修改")
+    @PutMapping("/edit")
+    @ResponseBody
+    public ResultJson edit(@RequestBody @Valid PERMISSION permission){
+
+        int i =permissionService.updateByPrimaryKeySelective(permission);
+
+        ResultJson resultJson = new ResultJson();
+        if (1==i){
+            resultJson = new ResultJson("200","修改成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+    @LogAnnotation(moduleName = "权限管理",operate = "权限删除")
+    @DeleteMapping("/del")
+    public ResultJson reomve(@RequestBody PERMISSION permission, HttpServletRequest request, HttpServletResponse response){
+
+        int i =permissionService.deleteByPrimaryKey(permission.getPermissionId().toString());
+
+        ResultJson resultJson = new ResultJson();
+        if (1==i){
+            resultJson = new ResultJson("200","删除成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+    @LogAnnotation(moduleName = "权限管理",operate = "权限批量删除")
+    @GetMapping("/batchremove")
+    public ResultJson reomve(String ids, HttpServletRequest request, HttpServletResponse response){
+
+        ResultJson resultJson = new ResultJson();
+
+        if (permissionService.deleteByPrimaryKey(ids)>0){
+            resultJson = new ResultJson("200","删除成功");
         }else {
             resultJson = new ResultJson("500","insert faild");
         }

@@ -2,6 +2,7 @@ package com.tianbo.warehouse.dao;
 
 import com.tianbo.warehouse.model.LOG;
 import com.tianbo.warehouse.model.LOGWithBLOBs;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,7 +15,7 @@ public interface LOGMapper {
 
     LOGWithBLOBs selectByPrimaryKey(Integer logid);
 
-    List<LOGWithBLOBs> selectAll();
+    List<LOGWithBLOBs> selectAll(@Param("username") String username, @Param("modelnamecn") String modelnamecn);
 
     int updateByPrimaryKeySelective(LOGWithBLOBs record);
 

 package com.tianbo.warehouse.dao;
 
 import com.tianbo.warehouse.model.PERMISSION;
+import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -18,7 +19,7 @@ public interface PERMISSIONMapper {
 
     int updateByPrimaryKey(PERMISSION record);
 
-    List<PERMISSION> findAll();
+    List<PERMISSION> findAll(@Param("name") String name);
 
     List<PERMISSION> getAllMenus();
 

@@ -39,7 +39,7 @@ public class USERS implements UserDetails {
 
     private Boolean state;
 
-    @Length(min = 11, max = 11, message = "mobilephone 长度必须为11位")
+//    @Length(min = 11, max = 11, message = "mobilephone 长度必须为11位")
     private String mobilephone;
 
     private Date creattime;
@@ -49,7 +49,7 @@ public class USERS implements UserDetails {
     private String userface;
 
     private String realname;
-    @Pattern(regexp="[a-za-z0-9._%+-]+@[a-za-z0-9.-]+\\.[a-za-z]{2,4}", message="邮件格式错误")
+//    @Pattern(regexp="[a-za-z0-9._%+-]+@[a-za-z0-9.-]+\\.[a-za-z]{2,4}", message="邮件格式错误")
     private String email;
 
     private Integer age;

@@ -34,7 +34,7 @@ public class MyInvocationSecurityMetadataSourceService implements FilterInvocati
         map = new HashMap<>();
         Collection<ConfigAttribute> array;
         ConfigAttribute cfg;
-        List<PERMISSION> permissions = permissionMapper.findAll();
+        List<PERMISSION> permissions = permissionMapper.findAll("");
         for(PERMISSION permission : permissions) {
             array = new ArrayList<>();
 
@@ -74,7 +74,7 @@ public class MyInvocationSecurityMetadataSourceService implements FilterInvocati
     public Collection<ConfigAttribute> loadResourceDefine(){
         Collection<ConfigAttribute> array;
         ConfigAttribute cfg;
-        List<PERMISSION> permissions = permissionMapper.findAll();
+        List<PERMISSION> permissions = permissionMapper.findAll("");
         for(PERMISSION permission : permissions) {
             array = new ArrayList<>();
 

@@ -8,5 +8,5 @@ public interface LogService {
 
     int insertSelective(LOGWithBLOBs record);
 
-    PageInfo<LOGWithBLOBs> selectAll(int pageNum, int pageSize);
+    PageInfo<LOGWithBLOBs> selectAll(int pageNum, int pageSize, String username, String modelnamecn);
 }

@@ -8,7 +8,7 @@ import java.util.Map;
 
 public interface PermissionService {
 
-    PageInfo<PERMISSION> findAll(int pageNum, int pageSize);
+    PageInfo<PERMISSION> findAll(int pageNum, int pageSize, String name);
 
     int insertSelective(PERMISSION record);
 
@@ -18,4 +18,9 @@ public interface PermissionService {
      * @return
      */
     Map<String,Object> getUserMenus(Integer userId);
+
+
+    int updateByPrimaryKeySelective(PERMISSION permission);
+
+    int deleteByPrimaryKey(String companyId);
 }

@@ -24,9 +24,9 @@ public class LogServiceImp  implements LogService{
    }
 
    @Override
-    public PageInfo<LOGWithBLOBs> selectAll(int pageNum,int pageSize){
+    public PageInfo<LOGWithBLOBs> selectAll(int pageNum,int pageSize, String username, String modelnamecn){
        Page<LOGWithBLOBs> page =  PageHelper.startPage(pageNum,pageSize);
-       List<LOGWithBLOBs> list = logMapper.selectAll();
+       List<LOGWithBLOBs> list = logMapper.selectAll(username, modelnamecn);
        PageInfo<LOGWithBLOBs> result = new PageInfo<LOGWithBLOBs>(list);
        return result;
     }

@@ -19,9 +19,9 @@ public class PermissionServiceImp implements PermissionService{
     PERMISSIONMapper permissionMapper;
 
     @Override
-    public PageInfo<PERMISSION> findAll(int pageNum, int pageSize){
+    public PageInfo<PERMISSION> findAll(int pageNum, int pageSize, String name){
         Page<PERMISSION> page =  PageHelper.startPage(pageNum,pageSize);
-        List<PERMISSION> list = permissionMapper.findAll();
+        List<PERMISSION> list = permissionMapper.findAll(name);
         PageInfo<PERMISSION> result = new PageInfo<>(list);
         return result;
     }
@@ -94,4 +94,31 @@ public class PermissionServiceImp implements PermissionService{
         }
         return childList;
     }
+
+
+    @Override
+    public int updateByPrimaryKeySelective(PERMISSION permission) {
+        return permissionMapper.updateByPrimaryKeySelective(permission);
+    }
+
+    @Override
+    public int deleteByPrimaryKey(String permissionId) {
+        if (permissionId.contains(",")){
+            try {
+                String[] split = permissionId.split(",");
+                for (int i=0; i<split.length; i++){
+                    permissionMapper.deleteByPrimaryKey(Integer.valueOf(split[i]));
+                }
+                System.out.println();
+                return 1;
+            }catch (Exception e){
+                e.printStackTrace();
+                return 0;
+            }
+        }else {
+
+            return permissionMapper.deleteByPrimaryKey(Integer.valueOf(permissionId));
+        }
+    }
+
 }

@@ -35,6 +35,13 @@
     ,
     <include refid="Blob_Column_List" />
     from log
+    where 1=1
+    <if test="modelnamecn != ''">
+      and modelNameCN = #{modelnamecn, jdbcType=VARCHAR}
+    </if>
+    <if test="username != ''">
+      and userName = #{username, jdbcType=VARCHAR}
+    </if>
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
     delete from log

@@ -28,7 +28,11 @@
   <select id="findAll" resultMap="BaseResultMap" >
     select
     <include refid="Base_Column_List" />
-    from permission ORDER BY ismenu,parent_id,permission_order
+    from permission
+    <if test="name != ''" >
+      where name = #{name, jdbcType=VARCHAR}
+    </if>
+    ORDER BY permission_order
   </select>
   <select id="getRolePermisson" resultMap="BaseResultMap" parameterType="java.lang.Integer">
     SELECT P.*

@@ -22,7 +22,7 @@
     SELECT
     <include refid="Base_Column_List" />
     FROM role
-    <if test="roleName != ''" >
+    <if test="roleName != ''  and roleName !=null" >
       where role_name = #{roleName, jdbcType=VARCHAR}
     </if>
   </select>