增加app用户管理1

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/AppUserManage.java

+package com.github.wxiaoqi.security.admin.entity;
+
+import lombok.Data;
+
+import javax.persistence.Column;
+
+@Data
+public class AppUserManage {
+
+    private  AppUserLogin appUserLogin;
+
+    private AppUserDetail appUserDetail;
+
+    private  BaseUserMember baseUserMember;
+}

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserManageBiz.java

+package com.github.wxiaoqi.security.admin.biz;
+
+import com.github.wxiaoqi.security.admin.entity.*;
+import com.github.wxiaoqi.security.admin.mapper.*;
+import com.github.wxiaoqi.security.admin.vo.AppUserVo;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import org.apache.commons.beanutils.BeanUtilsBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import tk.mybatis.mapper.entity.Example;
+
+
+
+/**
+ * app用户管理业务逻辑层
+ *
+ * @author Administrator
+ */
+@Service
+public class AppUserManageBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail> {
+
+    @Autowired
+    private AppUserLoginMapper appUserLoginMapper;
+
+    /**
+     * 根据条件查询
+     *
+     * @param appUserVo
+     * @return
+     */
+    public AppUserVo findAllByQuery(AppUserVo appUserVo) {
+        return mapper.selectAppUserManage(appUserVo);
+    }
+
+
+    @Transactional
+    public void deleteAppUser(Integer id) {
+        AppUserLogin appUserLogin = new AppUserLogin();
+        appUserLogin.setIsdel(1);
+        Example example = new Example(AppUserLogin.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andEqualTo("id", id);
+        appUserLogin.setUpdatetime(System.currentTimeMillis());
+        appUserLoginMapper.updateByExampleSelective(appUserLogin, example);
+
+        AppUserDetail appUserDetail = new AppUserDetail();
+        appUserDetail.setIsdel(1);
+        appUserDetail.setUpdatetime(System.currentTimeMillis());
+        Example detailExample = new Example(AppUserLogin.class);
+        Example.Criteria detailCriteria = detailExample.createCriteria();
+        criteria.andEqualTo("id", id);
+        mapper.updateByExampleSelective(appUserDetail, detailCriteria);
+
+    }
+
+    public AppUserVo findOneById(Integer id) {
+        return mapper.getUserInfo(id);
+    }
+
+    @Transactional
+    public void save(AppUserVo appUserVo) {
+        AppUserLogin appUserLogin = new AppUserLogin();
+        AppUserDetail appUserDetail = new AppUserDetail();
+
+        try {
+
+            BeanUtilsBean.getInstance().copyProperties(appUserLogin, appUserVo);
+            BeanUtilsBean.getInstance().copyProperties(appUserDetail, appUserVo);
+
+            if (appUserVo.getUserid() == null || appUserVo.getUserid() == 0) {
+
+
+                //设置登录用户信息
+                appUserLogin.setIsdel(0);
+                appUserLogin.setCreatetime(System.currentTimeMillis());
+                appUserLogin.setCertificationStatus(0);
+                appUserLogin.setStatus(0);
+                //设置用户详情
+                appUserDetail.setIsdel(0);
+                if (appUserDetail.getIsMember() == null) {
+                    appUserDetail.setIsMember(0);
+                }
+
+                appUserLoginMapper.insertSelective(appUserLogin);
+                mapper.insertSelective(appUserDetail);
+
+            } else {
+                appUserLogin.setUpdatetime(System.currentTimeMillis());
+                appUserDetail.setUpdatetime(System.currentTimeMillis());
+                appUserLoginMapper.updateByPrimaryKeySelective(appUserLogin);
+                mapper.updateByPrimaryKeySelective(appUserDetail);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+        }
+    }
+}

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/AppUserDetailMapper.java

 package com.github.wxiaoqi.security.admin.mapper;
 
 import com.github.wxiaoqi.security.admin.entity.AppUserDetail;
+import com.github.wxiaoqi.security.admin.entity.AppUserManage;
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
 import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.Mapper;
@@ -10,5 +11,5 @@ public interface AppUserDetailMapper extends Mapper<AppUserDetail> {
     //查询用户信息
     public AppUserVo getUserInfo(@Param("userId") Integer userId);
 
-
+    AppUserVo selectAppUserManage(AppUserVo appUserVo);
 }
\ No newline at end of file

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/AppUserLoginMapper.java

 package com.github.wxiaoqi.security.admin.mapper;
 
 import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
+import com.github.wxiaoqi.security.admin.entity.AppUserManage;
 import tk.mybatis.mapper.common.Mapper;
 
 public interface AppUserLoginMapper extends Mapper<AppUserLogin> {

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/AppUserMapper.java

 package com.github.wxiaoqi.security.admin.mapper;
 
 import com.github.wxiaoqi.security.admin.entity.AppUser;
+import com.github.wxiaoqi.security.admin.entity.AppUserManage;
 import com.github.wxiaoqi.security.admin.entity.Group;
 import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.Mapper;
@@ -17,4 +18,6 @@ public interface AppUserMapper extends Mapper<AppUser> {
     int insertAppUserGroup(@Param("appUserId") Integer appUserId, @Param("groups") Set<Integer> groups);
 
     int deleteAppUserGroup(Integer appUserId);
+
+
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUsersManageController.java

+package com.github.wxiaoqi.security.admin.rest;
+
+import com.github.wxiaoqi.security.admin.biz.AppUserManageBiz;
+import com.github.wxiaoqi.security.admin.entity.AppUserManage;
+import com.github.wxiaoqi.security.admin.vo.AppUserVo;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * app用户管理类
+ * @author Administrator
+ */
+@RestController
+@RequestMapping("appUsersManage")
+public class AppUsersManageController extends BaseController<AppUserManageBiz,AppUserManage> {
+
+    /**
+     * 查询所有
+     * @return
+     */
+    @GetMapping("/findAll")
+    public ObjectRestResponse<AppUserVo> findAllByQuery(@RequestBody AppUserVo  appUserVo){
+        return ObjectRestResponse.succ(baseBiz.findAllByQuery(appUserVo));
+    }
+
+    /**
+     * 删除
+     * @param id
+     * @return
+     */
+    @DeleteMapping("/deleteById/{id}")
+    public  ObjectRestResponse deleteById(@PathVariable Integer id){
+          baseBiz.deleteAppUser(id);
+        return ObjectRestResponse.succ();
+    }
+
+    /**
+     * 查询一条
+     * @param id
+     * @return
+     */
+    @GetMapping("/findOneById/{id}")
+    public ObjectRestResponse<AppUserVo> findOneById(@PathVariable Integer id){
+        return ObjectRestResponse.succ(baseBiz.findOneById(id));
+    }
+
+    @PostMapping("/save")
+    public ObjectRestResponse save(@RequestBody AppUserVo  appUserVo){
+        baseBiz.save(appUserVo);
+        return ObjectRestResponse.succ();
+    }
+
+
+}

ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml

@@ -28,6 +28,91 @@
   <select id="getUserInfo" resultMap="AppUserVoMap">
     select l.im_userid,l.username,l.wx_openid,l.unionid,l.openid,l.status,l.id_number,l.certification_status,d.*  from app_user_login l
     left join  app_user_detail d
-    on d.userid = l.id where d.userid = #{userId}  limit 1
+     where d.userid = #{userId}  limit 1
   </select>
+
+  <select id="selectAppUserManage" parameterType="Integer" resultMap="AppUserVoMap">
+    select l.im_userid,l.username,l.wx_openid,l.unionid,l.openid,l.status,l.id_number,l.certification_status,d.*  from app_user_login l
+    left join  app_user_detail d
+    on d.userid = l.id where 1=1
+
+      <if test="id != null">
+        and  d.id =#{id}
+      </if>
+
+      <if test="userid != null" >
+        and d.userid = #{userId}
+      </if>
+
+    <if test="username != null" >
+      and l.username=#{username}
+    </if>
+
+
+    <if test="imUserd != null" >
+      and l.im_userid=#{imUserid}
+    </if>
+
+    <if test="wxOpenid != null" >
+      and l.wx_openid=#{wxOpenid}
+    </if>
+
+    <if test="unionid != null" >
+      and l.unionid=#{unionid}
+    </if>
+
+    <if test="openid != null" >
+      and l.openid=#{openid}
+    </if>
+
+    <if test="status != null" >
+      and l.status=#{status}
+    </if>
+
+    <if test="idNumber != null" >
+      and l.id_number=#{idNumber}
+    </if>
+
+    <if test="certificationStatus != null" >
+      and l.certification_status=#{certificationStatus}
+    </if>
+
+    <if test="isMember != null" >
+      and d.is member=#{isMember}
+    </if>
+
+    <if test="nickname != null" >
+      and d.nickname=#{nickname}
+    </if>
+
+    <if test="realname != null" >
+      and d.realname=#{realname}
+    </if>
+
+    <if test="email != null" >
+      and d.email=#{email}
+    </if>
+
+    <if test="sex != null" >
+      and d.sex=#{sex}
+    </if>
+
+
+    <if test="birthday != null" >
+      and d.birthday=#{birthday}
+    </if>
+
+
+    <if test="personSign != null" >
+      and d.person_sign=#{personSign}
+    </if>
+
+    <if test="remark != null" >
+      and d.remark=#{remark}
+    </if>
+
+
+  </select>
+
+
 </mapper>
\ No newline at end of file

ace-modules/ace-admin/src/main/resources/mapper/AppUserMapper.xml

@@ -21,4 +21,6 @@
         right join app_group_member agm on bg.id = agm.group_id
         where user_id = #{id}
     </select>
+
+
 </mapper>
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/AccompanyingItemController.java

@@ -13,33 +13,39 @@ import com.xxfc.platform.vehicle.pojo.AddOrUpdateAccompanyingItem;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.vehicle.pojo.QueryAccompanyItemVo;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
+/**
+ * @author Administrator
+ */
 @RestController
 @RequestMapping("/accompanyingItem")
 @IgnoreClientToken
 @Slf4j
 public class AccompanyingItemController extends BaseController<AccompanyingItemBiz> {
 
-    @Autowired
-    AccompanyingItemBiz accompanyingItemBiz;
 
-    @RequestMapping(value ="/{id}",method = RequestMethod.GET)
-    private RestResponse<AccompanyingItem> get(@PathVariable Integer id) throws Exception{
+    /**
+     *
+     * @param id
+     * @return
+     * @throws Exception
+     */
+    @GetMapping(value ="/{id}")
+    public RestResponse<AccompanyingItem> get(@PathVariable Integer id) throws Exception{
         return RestResponse.codeAndData(RestResponse.SUC_CODE,baseBiz.get(id));
     }
 
     @RequestMapping(value ="/all",method = RequestMethod.GET)
-    private RestResponse<List<AccompanyingItem>> getAll(){
-        return RestResponse.codeAndData(RestResponse.SUC_CODE,accompanyingItemBiz.getAll());
+    public RestResponse<List<AccompanyingItem>> getAll(){
+        return RestResponse.codeAndData(RestResponse.SUC_CODE,baseBiz.getAll());
     }
 
 
     @RequestMapping(value ="/page",method = RequestMethod.GET)
-    private RestResponse<PageDataVO<AccompanyingItem>> getByPage(@RequestParam String queryAccompanyItemVoJson) throws Exception{
+    public RestResponse<PageDataVO<AccompanyingItem>> getByPage(@RequestParam String queryAccompanyItemVoJson) throws Exception{
         QueryAccompanyItemVo queryAccompanyItemVo = null;
         try {
             queryAccompanyItemVo = JSON.parseObject(queryAccompanyItemVoJson,QueryAccompanyItemVo.class);
@@ -52,17 +58,17 @@ public class AccompanyingItemController extends BaseController<AccompanyingItemB
     }
 
     @RequestMapping(value ="",method = RequestMethod.POST)
-    private RestResponse<Integer> add(@RequestBody AddOrUpdateAccompanyingItem addOrUpdateAccompanyingItem) throws Exception{
+    public RestResponse<Integer> add(@RequestBody AddOrUpdateAccompanyingItem addOrUpdateAccompanyingItem) throws Exception{
         return baseBiz.add(addOrUpdateAccompanyingItem);
     }
 
     @RequestMapping(value ="",method = RequestMethod.PUT)
-    private RestResponse<Integer> update(@RequestBody AddOrUpdateAccompanyingItem addOrUpdateAccompanyingItem) throws Exception{
+    public RestResponse<Integer> update(@RequestBody AddOrUpdateAccompanyingItem addOrUpdateAccompanyingItem) throws Exception{
         return baseBiz.update(addOrUpdateAccompanyingItem);
     }
 
     @RequestMapping(value ="/{id}",method = RequestMethod.DELETE)
-    private RestResponse<Integer> del(@PathVariable Integer id) throws Exception{
+    public RestResponse<Integer> del(@PathVariable Integer id) throws Exception{
         return baseBiz.del(id);
     }
 }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/AreaController.java

@@ -12,12 +12,18 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
+/**
+ * 片区
+ */
 @RestController
 @RequestMapping("/area")
 @Slf4j
 @IgnoreClientToken
 public class AreaController extends BaseController<AreaBiz, Area> {
-
+    /**
+     * 获取所有片区
+     * @return
+     */
     @GetMapping("/findAll")
     public RestResponse<List<Area>> findAll(){
         return RestResponse.suc(baseBiz.selectListAll());

xx-vehicle/xx-vehicle-server/src/test/java/com/xxfc/platform/vehicle/RegionTest.java

@@ -13,6 +13,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.github.stuxuhai.jpinyin.PinyinHelper;
 import com.github.wxiaoqi.security.common.msg.TableResultResponse;
 import com.github.wxiaoqi.security.common.util.Query;
+import com.google.common.collect.Sets;
 import com.xxfc.platform.vehicle.VehicleApplication;
 import com.xxfc.platform.vehicle.biz.SysRegionBiz;
 import com.xxfc.platform.vehicle.constant.RedisKey;
@@ -29,9 +30,7 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest(classes={VehicleApplication.class})
@@ -161,4 +160,28 @@ public class RegionTest {
     }
 
 
+     @Test
+    public void testStream(){
+         List<Integer> integers = Arrays.asList(1, 3, 5, 7, 9,9);
+         HashSet<Integer> objects = new HashSet<>();
+         objects.addAll(integers);
+         System.out.println(objects);
+         System.out.println("获取最小值");
+         Optional<Integer> min = objects.parallelStream().min(Integer::compareTo);
+         if (min.isPresent()) {
+             System.out.println(min.get());
+         }
+         System.out.println("获取最大");
+         Optional<Integer> max = integers.parallelStream().max(Integer::compareTo);
+         if (max.isPresent()) {
+             System.out.println(max.get());
+         }
+         System.out.println("排序");
+         integers.stream().sorted().forEach(elem -> System.out.println(elem));
+
+         System.out.println("筛选");
+         integers.parallelStream().filter(e ->e>1).filter(e -> e<9).forEach(e -> System.out.println(e));
+     }
+
+
 }