精彩活动

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

@@ -2,6 +2,7 @@ package com.github.wxiaoqi.security.admin.rest;
 
 import com.github.wxiaoqi.security.admin.biz.BaseUserMemberBiz;
 import com.github.wxiaoqi.security.admin.dto.BaseUserMemberVO;
+import com.github.wxiaoqi.security.admin.dto.UserMemberDTO;
 import com.github.wxiaoqi.security.admin.entity.AppUserManage;
 import com.github.wxiaoqi.security.admin.entity.BaseUserMember;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
@@ -33,13 +34,13 @@ public class BaseUserMemberController extends BaseController<BaseUserMemberBiz,
 
     /**
      * 设置用户会员
-     * @param baseUserMemberVO
+     * @param userMemberDTO
      * @return
      */
     @PutMapping("/setUserMember")
-    public ObjectRestResponse UpdateUserMember(@RequestBody BaseUserMemberVO baseUserMemberVO)
-            throws InvocationTargetException, IllegalAccessException {
-        baseBiz.UpdateUserMember(baseUserMemberVO);
+    public ObjectRestResponse UpdateUserMember(@RequestBody UserMemberDTO userMemberDTO)
+            throws Exception {
+        baseBiz.updUserMemberByUserId(userMemberDTO);
         return ObjectRestResponse.succ();
     }
 }

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/entity/ActivityPopup.java

@@ -58,6 +58,7 @@ public class ActivityPopup {
     @Column(name = "is_del")
     private Integer isDel;
 
-
+    @Column(name = "time_type")
+    private Integer timeType;
 
 }

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/entity/HomeActivities.java

 package com.xxfc.platform.activity.entity;
 
         import java.io.Serializable;
+        import java.math.BigInteger;
         import java.util.Date;
         import javax.persistence.*;
         import io.swagger.annotations.ApiModelProperty;
@@ -29,14 +30,14 @@ public class HomeActivities implements Serializable {
      */
     @Column(name = "crt_time")
     @ApiModelProperty(value = "创建时间", hidden = true )
-    private Long crtTime;
+    private BigInteger crtTime;
 
     /**
      *  更新时间
      */
     @Column(name = "upd_time")
     @ApiModelProperty(value = "更新时间", hidden = true )
-    private Long updTime;
+    private BigInteger updTime;
 
     /**
      *  活动名称
@@ -50,14 +51,14 @@ public class HomeActivities implements Serializable {
      */
     @Column(name = "start_time")
     @ApiModelProperty(value = "活动开始时间")
-    private Long startTime;
+    private BigInteger startTime;
 
     /**
      *  精彩活动结束时间
      */
     @Column(name = "end_time")
     @ApiModelProperty(value = "活动结束时间")
-    private Long endTime;
+    private BigInteger endTime;
 
 
     /**
@@ -99,4 +100,11 @@ public class HomeActivities implements Serializable {
     @ApiModelProperty(value = "是否删除")
     private Integer isDel;
 
+    /**
+     * 有效期限:0-永久 ,1-有期限
+     */
+    @Column(name = "time_type")
+    private Integer timeType;
+
+
 }

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityPopupBiz.java

@@ -14,6 +14,7 @@ import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.entity.Example;
 import tk.mybatis.mapper.weekend.WeekendSqls;
 
+import javax.swing.plaf.synth.SynthEditorPaneUI;
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -23,10 +24,11 @@ import java.util.stream.Collectors;
 
 /**
  * 活动弹窗biz
+ *
  * @author Administrator
  */
 @Service
-public class ActivityPopupBiz extends BaseBiz<ActivityPopupMapper,ActivityPopup> {
+public class ActivityPopupBiz extends BaseBiz<ActivityPopupMapper, ActivityPopup> {
     @Value("${activity.popup.loginTypes}")
     private String loginTypes;
 
@@ -38,36 +40,35 @@ public class ActivityPopupBiz extends BaseBiz<ActivityPopupMapper,ActivityPopup>
 
     /**
      * 获取活动弹窗,根据是否登录
+     *
      * @param userInfo
      * @return
      */
     public List<ActivityPopup> getActivityPopup(AppUserDTO userInfo) {
-        if (userInfo!=null){
-
-
+        if (userInfo != null) {
             List<ActivityPopup> activityPopups = getActivityPopupByTypes(loginTypes);
-            if (activityPopups==null||activityPopups.size()==0) {
+            if (activityPopups == null || activityPopups.size() == 0) {
                 return activityPopups;
             }
             List<Integer> collect = activityPopups.parallelStream().map(ActivityPopup::getId).collect(Collectors.toList());
-            Example exaple= Example.builder(ActivityPopupUser.class)
+            Example exaple = Example.builder(ActivityPopupUser.class)
                     .where(WeekendSqls.<ActivityPopupUser>custom()
-                            .andEqualTo(ActivityPopupUser::getUserId,userInfo.getUserid())
-                            .andIn(ActivityPopupUser::getPopupId,collect)
+                            .andEqualTo(ActivityPopupUser::getUserId, userInfo.getUserid())
+                            .andIn(ActivityPopupUser::getPopupId, collect)
                     ).build();
             List<ActivityPopupUser> activityPopupUsers = activityPopupUserBiz.selectByExample(exaple);
-            if (activityPopupUsers==null||activityPopupUsers.size()==0) {
+            if (activityPopupUsers == null || activityPopupUsers.size() == 0) {
                 return activityPopups;
             }
             Set<Integer> popupIdSet = activityPopupUsers.parallelStream().map(ActivityPopupUser::getPopupId).collect(Collectors.toSet());
-            List<ActivityPopup> result= new ArrayList<>();
+            List<ActivityPopup> result = new ArrayList<>();
             for (ActivityPopup activityPopup : activityPopups) {
-                if (popupIdSet.add(activityPopup.getId())){
+                if (popupIdSet.add(activityPopup.getId())) {
                     result.add(activityPopup);
                 }
             }
             return result;
-        }else {
+        } else {
 
             return getActivityPopupByTypes(notLoginTypes);
 
@@ -77,41 +78,57 @@ public class ActivityPopupBiz extends BaseBiz<ActivityPopupMapper,ActivityPopup>
 
     /**
      * 根据不同的用户,可查询寻的类型.得到对应的弹窗
+     *
      * @param Types
      * @return
      */
     private List<ActivityPopup> getActivityPopupByTypes(String Types) {
-
+        long timeMillis = System.currentTimeMillis();
+        //获取有期限的弹窗timeType=1
         Example exa = Example.builder(ActivityPopup.class)
                 .where(
                         WeekendSqls.<ActivityPopup>custom()
-                                .andGreaterThanOrEqualTo(ActivityPopup::getEndTime, BigInteger.valueOf(System.currentTimeMillis()))
-                                .andLessThanOrEqualTo(ActivityPopup::getStartTime, BigInteger.valueOf(System.currentTimeMillis()))
+                                .andEqualTo(ActivityPopup::getTimeType, 1)
+                                .andGreaterThanOrEqualTo(ActivityPopup::getEndTime, BigInteger.valueOf(timeMillis))
+                                .andLessThanOrEqualTo(ActivityPopup::getStartTime, BigInteger.valueOf(timeMillis))
                                 .andIn(ActivityPopup::getType, Arrays.asList(Types.split(",")))
                                 .andEqualTo(ActivityPopup::getStatus, 1)
-                                .andEqualTo(ActivityPopup::getIsDel,0)
+                                .andEqualTo(ActivityPopup::getIsDel, 0)
+
                 ).orderByAsc("sort").build();
         List<ActivityPopup> activityPopups = mapper.selectByExample(exa);
-        long l = System.currentTimeMillis();
-        return  activityPopups ;
+
+        //获取永久的弹窗timeType=0
+        Example permanentExa = Example.builder(ActivityPopup.class)
+                .where(
+                        WeekendSqls.<ActivityPopup>custom()
+                                .andEqualTo(ActivityPopup::getTimeType, 0)
+                                .andIn(ActivityPopup::getType, Arrays.asList(Types.split(",")))
+                                .andEqualTo(ActivityPopup::getStatus, 1)
+                                .andEqualTo(ActivityPopup::getIsDel, 0)
+                ).orderByAsc("sort").build();
+        List<ActivityPopup> permanentActivityPopups = mapper.selectByExample(permanentExa);
+        activityPopups.addAll(permanentActivityPopups);
+        return activityPopups;
     }
 
 
     /**
      * 判断是否重复弹窗
+     *
      * @param userInfo
      * @param id
      */
     @Transactional(rollbackFor = Exception.class)
-    public  void  setActivityPopup(AppUserDTO userInfo,Integer id){
-        if (userInfo!=null) {
-            Example exa=Example.builder(ActivityPopupUser.class).where(
+    public void setActivityPopup(AppUserDTO userInfo, Integer id) {
+        if (userInfo != null) {
+            Example exa = Example.builder(ActivityPopupUser.class).where(
                     WeekendSqls.<ActivityPopupUser>custom()
-                    .andEqualTo(ActivityPopupUser::getPopupId,id)
-                    .andEqualTo(ActivityPopupUser::getUserId,userInfo.getUserid())
+                            .andEqualTo(ActivityPopupUser::getPopupId, id)
+                            .andEqualTo(ActivityPopupUser::getUserId, userInfo.getUserid())
             ).build();
             List<ActivityPopupUser> activityPopupUsers = activityPopupUserBiz.selectByExample(exa);
-            if (activityPopupUsers==null||activityPopupUsers.size()==0) {
+            if (activityPopupUsers == null || activityPopupUsers.size() == 0) {
                 ActivityPopupUser activityPopupUser = new ActivityPopupUser();
                 activityPopupUser.setPopupId(id);
                 activityPopupUser.setUserId(userInfo.getUserid());
@@ -126,11 +143,25 @@ public class ActivityPopupBiz extends BaseBiz<ActivityPopupMapper,ActivityPopup>
 
     public void deleteOne(Integer id) {
         ActivityPopup activityPopup = selectById(id);
-        if (activityPopup.getStatus()==1) {
+        if (activityPopup.getStatus() == 1) {
             throw new BaseException("Please take it off the shelves first");
-        }else{
+        } else {
             activityPopup.setIsDel(1);
         }
         updateById(activityPopup);
     }
+
+    @Override
+    public int updateSelectiveByIdRe(ActivityPopup activityPopup) {
+       activityPopup.setUpdTime(BigInteger.valueOf(System.currentTimeMillis()));
+        return mapper.updateByPrimaryKeySelective(activityPopup);
+    }
+
+    @Override
+    public int insertSelectiveRe(ActivityPopup activityPopup) {
+        activityPopup.setCrtTime(BigInteger.valueOf(System.currentTimeMillis()));
+        activityPopup.setSort(0);
+        activityPopup.setTimeType(0);
+        return mapper.insertSelective(activityPopup);
+    }
 }

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/HomeActivitiesBiz.java

@@ -14,6 +14,7 @@ import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.entity.Example;
 import tk.mybatis.mapper.weekend.WeekendSqls;
 
+import java.math.BigInteger;
 import java.util.List;
 /**
  * @author Administrator
@@ -23,12 +24,22 @@ public class HomeActivitiesBiz extends BaseBiz<HomeActivitiesMapper, HomeActivit
     public List<HomeActivities> activities () {
         long currentTime = System.currentTimeMillis();
         Example exa=Example.builder(HomeActivities.class).where(WeekendSqls.<HomeActivities>custom()
+                .andEqualTo(HomeActivities::getTimeType,1)
                 .andGreaterThanOrEqualTo(HomeActivities::getEndTime,currentTime)
                 .andLessThanOrEqualTo(HomeActivities::getStartTime,currentTime)
                 .andEqualTo(HomeActivities::getStatus,1)
                 .andEqualTo(HomeActivities::getIsDel,0)
+
         ).orderByAsc("sort").build();
         List<HomeActivities> activityLists = selectByExample(exa);
+
+        Example permanentExa=Example.builder(HomeActivities.class).where(WeekendSqls.<HomeActivities>custom()
+                .andEqualTo(HomeActivities::getTimeType,0)
+                .andEqualTo(HomeActivities::getStatus,1)
+                .andEqualTo(HomeActivities::getIsDel,0)
+        ).orderByAsc("sort").build();
+        List<HomeActivities> permanentActivityLists = selectByExample(permanentExa);
+        activityLists.addAll(permanentActivityLists);
         return activityLists;
 
     }
@@ -36,10 +47,11 @@ public class HomeActivitiesBiz extends BaseBiz<HomeActivitiesMapper, HomeActivit
     public PageInfo<HomeActivities> getPage (ActivitiesQuery query)  {
 
         Example exa =new Example(HomeActivities.class);
+        Example.Criteria criteria = exa.createCriteria();
         if (StringUtils.isNotBlank(query.getActivitiesName())){
-            exa.createCriteria().andLike("name","%"+query.getActivitiesName()+"%");
+            criteria.andLike("name","%"+query.getActivitiesName()+"%");
         }
-        exa.createCriteria().andEqualTo("isDel",0);
+        criteria.andEqualTo("isDel",0);
         exa.orderBy("sort").asc();
         PageHelper.startPage(query.getPage(),query.getLimit());
         List<HomeActivities> activityLists = selectByExample(exa);
@@ -56,4 +68,19 @@ public class HomeActivitiesBiz extends BaseBiz<HomeActivitiesMapper, HomeActivit
 
         updateById(homeActivities);
     }
+
+
+    @Override
+    public int updateSelectiveByIdRe(HomeActivities activityPopup) {
+        activityPopup.setUpdTime(BigInteger.valueOf(System.currentTimeMillis()));
+        return mapper.updateByPrimaryKeySelective(activityPopup);
+    }
+
+    @Override
+    public int insertSelectiveRe(HomeActivities activityPopup) {
+        activityPopup.setCrtTime(BigInteger.valueOf(System.currentTimeMillis()));
+        activityPopup.setSort(0);
+        activityPopup.setTimeType(0);
+        return mapper.insertSelective(activityPopup);
+    }
 }

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/ActivityPopupManageController.java

@@ -7,6 +7,7 @@ import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.xxfc.platform.activity.biz.ActivityPopupBiz;
 import com.xxfc.platform.activity.entity.ActivityPopup;
 import com.xxfc.platform.activity.vo.PopupQuery;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.*;
@@ -45,11 +46,12 @@ public class ActivityPopupManageController extends BaseController<ActivityPopupB
      * @param id
      * @return
      */
-    @PostMapping(value = "/manage/getOne/{id}")
+    @GetMapping(value = "/manage/getOne/{id}")
     public ObjectRestResponse<ActivityPopup> getOne(@PathVariable Integer id) {
         Example exa=new Example(ActivityPopup.class);
-        exa.createCriteria().andEqualTo("isDel",0);
-        exa.createCriteria().andEqualTo("id",id);
+        Example.Criteria criteria = exa.createCriteria();
+        criteria.andEqualTo("isDel",0);
+        criteria.andEqualTo("id",id);
         List<ActivityPopup> activityPopups = baseBiz.selectByExample(exa);
         if (activityPopups==null||activityPopups.size()==0) {
             return ObjectRestResponse.succ(new ActivityPopup());
@@ -71,4 +73,18 @@ public class ActivityPopupManageController extends BaseController<ActivityPopupB
         return ObjectRestResponse.succ();
     }
 
+
+//    /**
+//     * 添加
+//     * @param activityPopup
+//     * @return
+//     */
+//    @ApiOperation("保存")
+//    @PutMapping(value = "save")
+//    @ResponseBody
+//    public ObjectRestResponse<ActivityPopup> save(@RequestBody ActivityPopup activityPopup){
+//        baseBiz.save(activityPopup);
+//        return new ObjectRestResponse<ActivityPopup>();
+//    }
+
 }

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/HomeActivitiesController.java

@@ -28,7 +28,7 @@ public class HomeActivitiesController extends BaseController<HomeActivitiesBiz,
      * @throws IllegalAccessException
      */
     @GetMapping("/app/unauth/activity/findAll")
-    public ObjectRestResponse<List<HomeActivities>>  appFindAll() throws InvocationTargetException, IllegalAccessException {
+    public ObjectRestResponse<List<HomeActivities>>  appFindAll()  {
         List<HomeActivities> list= baseBiz.activities();
         return ObjectRestResponse.succ(list);
     }
@@ -49,7 +49,7 @@ public class HomeActivitiesController extends BaseController<HomeActivitiesBiz,
      * @param id
      * @return
      */
-    @PostMapping(value = "/manage/activity/getOne/{id}")
+    @GetMapping(value = "/manage/activity/getOne/{id}")
     public ObjectRestResponse<HomeActivities> getOne(@PathVariable Integer id) {
         Example exa=new Example(HomeActivities.class);
         Example.Criteria criteria = exa.createCriteria();

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/biz/AppVersionBiz.java

@@ -112,7 +112,7 @@ public class AppVersionBiz extends BaseBiz<AppVersionMapper,AppVersion> {
         String realFileRelPath = dirPathToday + "/"+fileName;
         String filePath = uploadPath + realFileRelPath;
         FileUtils.copyInputStreamToFile(file.getInputStream(), new File(filePath));
-        realFileRelPath=Dev_url+realFileRelPath;
+//        filePath=Dev_url+filePath;
         return ObjectRestResponse.succ(filePath);
     }
 

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

@@ -26,7 +26,7 @@ public class VehicleActiveController {
      *
      * @return
      */
-    @PostMapping("departure")
+    @PostMapping("/departure")
     public RestResponse departure(@RequestBody VehicleDepartureVo departureVo) {
         if (departureVo == null || departureVo.getVehicleId() == null
                 || departureVo.getMileage() == null || departureVo.getDepartureBranchCompanyId() == null

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

@@ -125,7 +125,7 @@ public class VehicleCataController extends VehicleBaseController<VehiclePlatCata
      * @return
      */
     @PostMapping("/add/updateAndAdd")
-    public ObjectRestResponse updateAndAdd(@RequestBody Cascade<VehiclePlatCata> cas){
+    public ObjectRestResponse save(@RequestBody Cascade<VehiclePlatCata> cas){
 
         return  baseBiz.updateAndAdd(cas);
     }