Merge remote-tracking branch 'origin/dev' into dev

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

@@ -236,4 +236,9 @@ public class AppUserDetailBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
         List<AppUserDetail> userDetails = mapper.selectByExample(example);
         return CollectionUtils.isEmpty(userDetails)?Collections.emptyList():userDetails;
     }
-}
+
+    public List<AppUserDetail> findAllUserDetailWithNoProinceCode() {
+        List<AppUserDetail> appUserDetails = mapper.selectAllWithNoProviinceCode();
+        return CollectionUtils.isEmpty(appUserDetails)?Collections.EMPTY_LIST:appUserDetails;
+    }
+ }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/jobhandler/IPJobHandler.java

+package com.github.wxiaoqi.security.admin.jobhandler;
+
+import com.alibaba.fastjson.JSONObject;
+import com.github.wxiaoqi.security.admin.biz.AppUserDetailBiz;
+import com.github.wxiaoqi.security.admin.entity.AppUserDetail;
+import com.xxfc.platform.universal.dto.RegionDTO;
+import com.xxfc.platform.universal.feign.RegionFeign;
+import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.handler.IJobHandler;
+import com.xxl.job.core.handler.annotation.JobHandler;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.List;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/12/27 11:14
+ */
+@JobHandler(value = "ipAnalyticalJobHandler")
+@Component
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+@Slf4j
+//@RefreshScope
+public class IPJobHandler extends IJobHandler {
+    private final RestTemplate restTemplate;
+    private final RegionFeign regionFeign;
+    private final AppUserDetailBiz appUserDetailBiz;
+    private static  final Integer PROVINCECODE = 440000;
+    @Value("${ip.analytical.appId:xcjtqjromfuvjjtt}")
+    private String  appId;
+    @Value("${ip.analytical.secret:bzNRK3FUR2d3WGc0MmhKWGZINm5MQT09}")
+    private String  secret;
+    @Override
+    public ReturnT<String> execute(String s) throws Exception {
+
+        List<AppUserDetail> appUserDetails =  appUserDetailBiz.findAllUserDetailWithNoProinceCode();
+        for (AppUserDetail appUserDetail : appUserDetails) {
+              String crtHost = appUserDetail.getCrtHost();
+        if (log.isDebugEnabled()) {
+            log.debug("解析的地址：【{}】", crtHost + "---time===" + System.currentTimeMillis() / 1000L);
+        }
+        try {
+            analyticalIPByWebSiteAndIPAddress(IPAddress.BASE_IP_PARSING_URL2, crtHost, appUserDetail);
+        } catch (Exception e) {
+            try {
+                analyticalIPByWebSiteAndIPAddress(IPAddress.BASE_IP_PARSING_URL1, crtHost, appUserDetail);
+            } catch (Exception ex) {
+                appUserDetail.setProvinceCode(PROVINCECODE);
+                log.error("解析地址失败：【{}】", ex.getMessage());
+            }
+        }
+            appUserDetailBiz.updateSelectiveByIdRe(appUserDetail);
+        }
+        return ReturnT.SUCCESS;
+    }
+
+    private void analyticalIPByWebSiteAndIPAddress(String url, String crtHost, AppUserDetail appUserDetail) {
+        String ipAddress = restTemplate.getForObject(String.format("%s%s&app_id=%s&app_secret=%s", url, crtHost,appId,secret), String.class);
+        String data = JSONObject.parseObject(ipAddress).getString(IPAddress.BASE_DATA);
+        JSONObject ipJsonObject = JSONObject.parseObject(data);
+        String cityName = ipJsonObject.getString(IPAddress.CITY_NAME);
+        RegionDTO regionDTO = regionFeign.getRegionByCityName(StringUtils.isEmpty(cityName) ? "东莞" : cityName);
+        if (null != regionDTO) {
+            appUserDetail.setProvinceCode(Integer.valueOf(String.valueOf(regionDTO.getParentId())));
+            appUserDetail.setCityCode(Integer.valueOf(String.valueOf(regionDTO.getId())));
+        }else{
+            if (StringUtils.isNotEmpty(cityName)){
+                appUserDetail.setProvinceCode(Integer.valueOf(ipJsonObject.get(IPAddress.RPOINCE_ID).toString()));
+                appUserDetail.setCityCode(Integer.valueOf(ipJsonObject.get(IPAddress.CITY_ID).toString()));
+            }
+        }
+
+
+    }
+
+    /**
+     * @author libin
+     * @version 1.0.0
+     * @dec ip 解析返回的地址信息
+     */
+    private static class IPAddress {
+        public static final String BASE_IP_PARSING_URL1 = "http://ip.taobao.com/service/getIpInfo.php?ip=";
+        public static final String BASE_IP_PARSING_URL2 = "https://www.mxnzp.com/api/ip/aim_ip?ip=";
+        public static final String BASE_DATA = "data";
+        public static final String CITY_NAME = "city";
+        public static final String RPOINCE_ID="provinceId";
+        public static final String CITY_ID="cityId";
+    }
+}

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

@@ -38,4 +38,7 @@ public interface AppUserDetailMapper extends Mapper<AppUserDetail> {
     AppUserVo getUser(Integer userId);
 
     List<UserBo> findUserBosByPhones(@Param("phones") List<String> phones);
+
+    List<AppUserDetail> selectAllWithNoProviinceCode();
+
 }
\ No newline at end of file

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java

@@ -26,7 +26,6 @@ import com.github.wxiaoqi.security.common.util.process.SystemConfig;
 import com.github.wxiaoqi.security.common.util.result.JsonResultUtil;
 import com.xxfc.platform.activity.feign.ActivityFeign;
 import com.xxfc.platform.im.feign.ImFeign;
-import com.xxfc.platform.universal.dto.RegionDTO;
 import com.xxfc.platform.universal.dto.SmsTemplateDTO;
 import com.xxfc.platform.universal.feign.MQSenderFeign;
 import com.xxfc.platform.universal.feign.RegionFeign;
@@ -1208,55 +1207,6 @@ public class AppPermissionService {
         }
     }
 
-    /**
-     * ip地址 信息解析
-     *
-     * @param appUserDetail
-     */
-    public void setCreateIPInfo(AppUserDetail appUserDetail) {
-        String crtHost = appUserDetail.getCrtHost();
-        if (log.isDebugEnabled()) {
-            log.debug("解析的地址：【{}】", crtHost+"---time==="+System.currentTimeMillis()/1000L);
-        }
-        try {
-            analyticalIPByWebSiteAndIPAddress(IPAddress.BASE_IP_PARSING_URL2, crtHost, appUserDetail);
-        } catch (Exception e) {
-            try {
-                analyticalIPByWebSiteAndIPAddress(IPAddress.BASE_IP_PARSING_URL1, crtHost, appUserDetail);
-            } catch (Exception ex) {
-                log.error("解析地址失败：【{}】", ex.getMessage());
-            }
-
-        }
-
-    }
-
-    private void analyticalIPByWebSiteAndIPAddress(String url, String crtHost, AppUserDetail appUserDetail) {
-        String ipAddress = restTemplate.getForObject(String.format("%s%s", url, crtHost), String.class);
-            log.debug("解析的调用网站后：【{}】", crtHost+"---time==="+System.currentTimeMillis()/1000L);
-            String data = JSONObject.parseObject(ipAddress).getString(IPAddress.BASE_DATA);
-            JSONObject ipJsonObject = JSONObject.parseObject(data);
-            String cityName = ipJsonObject.getString(IPAddress.CITY_NAME);
-            RegionDTO regionDTO = regionFeign.getRegionByCityName(StringUtils.isEmpty(cityName) ? "东莞" : cityName);
-            log.debug("解析的调用服务后：【{}】", crtHost+"---time==="+System.currentTimeMillis()/1000L);
-            if (null != regionDTO) {
-                appUserDetail.setProvinceCode(Integer.valueOf(String.valueOf(regionDTO.getParentId())));
-                appUserDetail.setCityCode(Integer.valueOf(String.valueOf(regionDTO.getId())));
-        }
-    }
-
-    /**
-     * @author libin
-     * @version 1.0.0
-     * @dec ip 解析返回的地址信息
-     */
-    private static class IPAddress {
-        public static final String BASE_IP_PARSING_URL1 = "http://ip.taobao.com/service/getIpInfo.php?ip=";
-        public static final String BASE_IP_PARSING_URL2 = "https://www.mxnzp.com/api/ip/aim_ip?ip=";
-        public static final String BASE_DATA = "data";
-        public static final String CITY_NAME = "city";
-    }
-
     //修改手机号码
     public  ObjectRestResponse  updUsername(Integer userId,String username,String mobileCode){
         if (StringUtils.isBlank(username)||StringUtils.isBlank(mobileCode)||userId==0||userId==null){

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

@@ -338,4 +338,9 @@ from   `app_user_detail` as `aud` left join `app_user_login` as `aul` on aul.id=
      </foreach>
      </if>) as aul inner join `app_user_detail` as aud on aud.userid=aul.id
     </select>
+
+    <select id="selectAllWithNoProviinceCode"
+            resultType="com.github.wxiaoqi.security.admin.entity.AppUserDetail">
+        select `id`,`crt_host` from  `app_user_detail` where crt_host is not null and ( province_code = 0 or province_code is null)
+    </select>
 </mapper>
\ No newline at end of file

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

@@ -65,14 +65,14 @@ public class ActivityLuckyDrawBiz extends BaseBiz<ActivityLuckyDrawMapper, Activ
     }
 
     public void exportActivityLuckDrawData(ActivityLuckDrawFindDTO activityLuckDrawFindDTO, ServletOutputStream outputStream) throws IOException {
-        List<ActivityLuckyDraw> activityLuckyDraws = listActivityLuckDraw(activityLuckDrawFindDTO);
+        List<ActivityLuckyDrawListVo> activityLuckyDraws = listActivityLuckDraw(activityLuckDrawFindDTO);
         ExcelUtils excelUtils = new ExcelUtils("报名列表");
         XSSFWorkbook hssfWorkbook = excelUtils.getHssfWorkbook();
         XSSFSheet sheet = excelUtils.getSheet();
 
         Row headerRow = sheet.createRow(0);
         CellStyle headerCellStyle = excelUtils.createHeaderCellStyle();
-        String[] headers = {"姓名","电话","人数","报名时间"};
+        String[] headers = {"姓名","电话","身份","上级姓名","上级电话","人数","报名时间"};
         excelUtils.createHeader(headerRow,0,headers,headerCellStyle);
 
         CellStyle generalCellStyle = excelUtils.createGeneralCellStyle();
@@ -85,23 +85,24 @@ public class ActivityLuckyDrawBiz extends BaseBiz<ActivityLuckyDrawMapper, Activ
 
     }
 
-    private List<String[]> getActivityLuckDrawDataList(List<ActivityLuckyDraw> activityLuckyDraws){
+    private List<String[]> getActivityLuckDrawDataList(List<ActivityLuckyDrawListVo> activityLuckyDraws){
          List<String[]> activityLuckDrawDataList = new ArrayList<>(activityLuckyDraws.size());
-        for (ActivityLuckyDraw activityLuckyDraw : activityLuckyDraws) {
+        for (ActivityLuckyDrawListVo activityLuckyDraw : activityLuckyDraws) {
             String[] activityLuckDrawData = getActivityLuckDrawData(activityLuckyDraw);
             activityLuckDrawDataList.add(activityLuckDrawData);
         }
         return activityLuckDrawDataList;
     }
 
-    private String[] getActivityLuckDrawData(ActivityLuckyDraw activityLuckyDraw){
+    private String[] getActivityLuckDrawData(ActivityLuckyDrawListVo activityLuckyDraw){
         Date crtTime = activityLuckyDraw.getCrtTime();
         String timeStr = DateUtil.format(crtTime, "yyyy-MM-dd HH:mm:ss");
-        return new String[]{activityLuckyDraw.getUserName(),activityLuckyDraw.getPhone(),activityLuckyDraw.getTicketNum()+"",timeStr};
+        return new String[]{activityLuckyDraw.getUserName(),activityLuckyDraw.getPhone(),activityLuckyDraw.getPositionName(),activityLuckyDraw.getParentName(),activityLuckyDraw.getParentPhone(),activityLuckyDraw.getTicketNum()+"",timeStr};
     }
 
-    public List<ActivityLuckyDraw> listActivityLuckDraw(ActivityLuckDrawFindDTO activityLuckDrawFindDTO){
-        List<ActivityLuckyDraw> activityLuckyDraws = mapper.listLuckDrawWithPage(activityLuckDrawFindDTO);
+    public List<ActivityLuckyDrawListVo> listActivityLuckDraw(ActivityLuckDrawFindDTO activityLuckDrawFindDTO){
+        Query query = new Query(activityLuckDrawFindDTO);
+        List<ActivityLuckyDrawListVo> activityLuckyDraws = mapper.getAllByPage(query.getSuper());
         if (CollectionUtils.isEmpty(activityLuckyDraws)){
             return Collections.EMPTY_LIST;
         }

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

@@ -8,10 +8,8 @@ import com.xxfc.platform.activity.dto.ActivityLuckDrawFindDTO;
 import com.xxfc.platform.activity.vo.ActivityLuckyDrawListVo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
@@ -25,7 +23,7 @@ import java.time.format.DateTimeFormatter;
  * @data 2019/12/3 16:51
  */
 
-@RestController
+@Controller
 @RequestMapping("admin/activityLuckyDraw")
 @RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class ActivityLuckyDrawAdminController {
@@ -38,6 +36,7 @@ public class ActivityLuckyDrawAdminController {
      * @return
      */
     @PostMapping("/page")
+    @ResponseBody
     public ObjectRestResponse<PageDataVO<ActivityLuckyDrawListVo>> listActivtyLuckyDrawWithPage(@RequestBody ActivityLuckDrawFindDTO activityLuckDrawFindDTO) {
         return activityLuckyDrawBiz.getAll(activityLuckDrawFindDTO);
     }