悦行冬奥路接口提交1

src/main/java/com/dlbridge/jadp/plugins/cmpt/bean/JoyfulRichTextBean.java

+package com.dlbridge.jadp.plugins.cmpt.bean;
+
+import lombok.Data;
+
+@Data
+public class JoyfulRichTextBean {
+    private String type;
+    private String title;
+    private String lng;
+    private String lat;
+    private String distance;
+}
\ No newline at end of file

src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/mapper/CmptSettingMapper.java

@@ -61,4 +61,6 @@ public interface CmptSettingMapper {
     Func getFuncById(String id);
 
     int updateByType(@Param("setting") CmptSetting cmptSetting);
-}
+
+    int updCmptsettingName(CmptSetting cmptSetting);
+}
\ No newline at end of file

src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/mapper/CmptSettingMapper.xml

@@ -241,5 +241,16 @@
         where id=#{id}
     </select>
 
-</mapper>
-
+    <update id="updCmptsettingName">
+        UPDATE
+            gksite.gk_cmptsetting
+        SET
+            name = #{name}
+            ,name_web = #{name}
+            ,update_by = #{updateById}
+            ,update_date = now()
+        WHERE
+            type = #{type}
+            AND cmptid = #{cmptId}
+    </update>
+</mapper>
\ No newline at end of file

src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/mapper/JoyfulCheckinRecordsMapper.java

+package com.dlbridge.jadp.plugins.cmpt.dao.mapper;
+
+import com.dlbridge.jadp.plugins.cmpt.dao.model.JoyfulCheckinRecords;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 活动签到打卡记录
+ *
+ * @author LI
+ */
+public interface JoyfulCheckinRecordsMapper {
+
+    int insJoyfulCheckinRecords(JoyfulCheckinRecords joyfulCheckinRecords);
+
+    List<JoyfulCheckinRecords> getJoyfulCheckinRecordsList(@Param("userId") String userId, @Param("offset") int offset, @Param("pageCount") int pageCount);
+}
\ No newline at end of file

src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/mapper/JoyfulCheckinRecordsMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dlbridge.jadp.plugins.cmpt.dao.mapper.JoyfulCheckinRecordsMapper">
+
+    <insert id="insJoyfulCheckinRecords">
+        INSERT INTO gksite.joyful_checkin_records (
+            userId
+            ,activity_id
+            ,checkin_time
+        ) VALUES (
+            #{userId}
+            ,#{activityId}
+            ,now()
+        )
+    </insert>
+
+    <select id="getJoyfulCheckinRecordsList" resultType="com.dlbridge.jadp.plugins.cmpt.dao.model.JoyfulCheckinRecords">
+        SELECT
+            t2.title
+            ,DATE_FORMAT(t1.checkin_time,'%Y/%m/%d %H:%i:%s') AS checkinTime
+        FROM
+            gksite.joyful_checkin_records t1
+            INNER JOIN gksite.joyful_rich_text t2
+                ON t1.activity_id = t2.id
+                AND t2.del_flg = '0'
+        WHERE
+            t1.userId = #{userId}
+        ORDER BY t1.checkin_time DESC
+        LIMIT #{offset}, #{pageCount}
+    </select>
+</mapper>
\ No newline at end of file

src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/mapper/JoyfulRichTextMapper.java

+package com.dlbridge.jadp.plugins.cmpt.dao.mapper;
+
+import com.dlbridge.jadp.plugins.cmpt.dao.model.JoyfulRichText;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 用户积分
+ *
+ * @author LI
+ */
+public interface JoyfulRichTextMapper {
+
+    int insJoyfulRichText(JoyfulRichText joyfulRichText);
+
+    int updJoyfulRichText(JoyfulRichText joyfulRichText);
+
+    int delJoyfulRichText(JoyfulRichText joyfulRichText);
+
+    List<JoyfulRichText> getJoyfulRichTextById(@Param("id") String id);
+
+    List<JoyfulRichText> getJoyfulRichTextList(@Param("type") String type, @Param("title") String title);
+}
\ No newline at end of file

src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/mapper/JoyfulRichTextMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dlbridge.jadp.plugins.cmpt.dao.mapper.JoyfulRichTextMapper">
+
+    <insert id="insJoyfulRichText">
+        INSERT INTO gksite.joyful_rich_text(
+            userId
+            ,type
+            ,title
+            ,address
+            ,lng
+            ,lat
+            ,content
+            ,img_url
+            ,remark1
+            ,remark2
+            ,remark3
+            ,remark4
+            ,status
+            ,del_flg
+            ,create_time
+            ,create_user
+        ) VALUES (
+            #{userId}
+            ,#{type}
+            ,#{title}
+            ,#{address}
+            ,#{lng}
+            ,#{lat}
+            ,#{content}
+            ,#{imgUrl}
+            ,#{remark1}
+            ,#{remark2}
+            ,#{remark3}
+            ,#{remark4}
+            ,#{status}
+            ,'0'
+            ,now()
+            ,#{userId}
+        )
+    </insert>
+
+    <update id="updJoyfulRichText">
+        UPDATE
+            gksite.joyful_rich_text
+        SET
+            userId = #{userId}
+            ,type = #{type}
+            ,title = #{title}
+            ,address = #{address}
+            ,lng = #{lng}
+            ,lat = #{lat}
+            ,content = #{content}
+            ,img_url = #{imgUrl}
+            ,remark1 = #{remark1}
+            ,remark2 = #{remark2}
+            ,remark3 = #{remark3}
+            ,remark4 = #{remark4}
+            ,status = #{status}
+            ,update_time = now()
+            ,update_user = #{userId}
+        WHERE
+            id = #{id}
+    </update>
+
+    <update id="delJoyfulRichText">
+        UPDATE
+            gksite.joyful_rich_text
+        SET
+            del_flg = '1'
+            ,update_time = now()
+            ,update_user = #{userId}
+        WHERE
+            id = #{id}
+    </update>
+
+    <select id="getJoyfulRichTextById" resultType="com.dlbridge.jadp.plugins.cmpt.dao.model.JoyfulRichText">
+        SELECT
+            id
+            ,userId
+            ,type
+            ,title
+            ,address
+            ,lng
+            ,lat
+            ,content
+            ,img_url AS imgUrl
+            ,remark1
+            ,remark2
+            ,remark3
+            ,remark4
+        FROM
+            gksite.joyful_rich_text
+        WHERE
+            id = #{id}
+    </select>
+
+    <select id="getJoyfulRichTextList" resultType="com.dlbridge.jadp.plugins.cmpt.dao.model.JoyfulRichText">
+        SELECT
+            title
+            ,address
+            ,lng
+            ,lat
+            ,img_url AS imgUrl
+            ,remark1
+            ,remark2
+            ,remark3
+            ,remark4
+        FROM
+            gksite.joyful_rich_text
+        WHERE
+            del_flg = '0'
+            <if test="type != null and type != ''">
+                AND type = #{type}
+            </if>
+            <if test="title != null and title != ''">
+                AND title like concat('%',#{title},'%')
+            </if>
+    </select>
+</mapper>
\ No newline at end of file

src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/mapper/UserPointMapper.java

+package com.dlbridge.jadp.plugins.cmpt.dao.mapper;
+
+import com.dlbridge.jadp.plugins.cmpt.dao.model.PointRecord;
+import com.dlbridge.jadp.plugins.cmpt.dao.model.UserPoint;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 用户积分
+ *
+ * @author LI
+ */
+public interface UserPointMapper {
+
+    List<UserPoint> getPoint(@Param("userId") String userId);
+
+    List<PointRecord> getPointRecord(@Param("userId") String userId, @Param("isNegative") String isNegative, @Param("offset") int offset, @Param("pageCount") int pageCount);
+}
\ No newline at end of file

src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/mapper/UserPointMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dlbridge.jadp.plugins.cmpt.dao.mapper.UserPointMapper">
+
+    <select id="getPoint" resultType="com.dlbridge.jadp.plugins.cmpt.dao.model.UserPoint">
+        SELECT
+            point
+        FROM
+            raceenroll.point
+        WHERE
+            userId = #{userId}
+    </select>
+
+    <select id="getPointRecord" resultType="com.dlbridge.jadp.plugins.cmpt.dao.model.PointRecord">
+        SELECT
+            typeName
+            ,IF(isNegative = '1', -1 * point, point) as point
+            ,DATE_FORMAT(createTime,'%Y/%m/%d %H:%i:%s') AS createTime
+        FROM
+            raceenroll.pointrecord
+        WHERE
+            userId = #{userId}
+            AND isNegative = #{isNegative}
+        ORDER BY createTime DESC
+        LIMIT #{offset}, #{pageCount}
+    </select>
+</mapper>
\ No newline at end of file

src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/model/CmptSetting.java

@@ -2,7 +2,6 @@ package com.dlbridge.jadp.plugins.cmpt.dao.model;
 
 import com.dlbridge.jadp.common.persistence.JaapRecord;
 
-
 public class CmptSetting extends JaapRecord<CmptSetting> {
 
     private static final long serialVersionUID = 1L;
@@ -16,6 +15,7 @@ public class CmptSetting extends JaapRecord<CmptSetting> {
     private String seq; // 顺序
     private String style;
     private int status;
+    private String updateById;
 
     public String getNameWeb() {
         return nameWeb;
@@ -89,5 +89,11 @@ public class CmptSetting extends JaapRecord<CmptSetting> {
         this.status = status;
     }
 
+    public String getUpdateById() {
+        return updateById;
+    }
 
-}
+    public void setUpdateById(String updateById) {
+        this.updateById = updateById;
+    }
+}
\ No newline at end of file

src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/model/JoyfulCheckinRecords.java

+package com.dlbridge.jadp.plugins.cmpt.dao.model;
+
+import lombok.Data;
+
+@Data
+public class JoyfulCheckinRecords {
+    private String userId;
+    private String activityId;
+    private String checkinTime;
+    private String title;
+}
\ No newline at end of file

src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/model/JoyfulRichText.java

+package com.dlbridge.jadp.plugins.cmpt.dao.model;
+
+import lombok.Data;
+
+@Data
+public class JoyfulRichText {
+    private String id;
+    private String userId;
+    private String type;
+    private String title;
+    private String address;
+    private String lng;
+    private String lat;
+    private String content;
+    private String imgUrl;
+    private String remark1;
+    private String remark2;
+    private String remark3;
+    private String remark4;
+    private String status;
+    private String delFlg;
+}
\ No newline at end of file

src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/model/PointRecord.java

+package com.dlbridge.jadp.plugins.cmpt.dao.model;
+
+import lombok.Data;
+
+@Data
+public class PointRecord {
+    private int point;
+    private String createTime;
+    private String typeName;
+}
\ No newline at end of file

src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/model/UserPoint.java

+package com.dlbridge.jadp.plugins.cmpt.dao.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class UserPoint {
+    private List<PointRecord> pointRecordList;
+    private int point;
+}
\ No newline at end of file

src/main/java/com/dlbridge/jadp/plugins/cmpt/service/CmptSettingService.java

@@ -125,4 +125,13 @@ public class CmptSettingService {
     public int updateByType(CmptSetting cmptSetting) {
         return cmptSettingMapper.updateByType(cmptSetting);
     }
-}
+
+    /**
+     * 模块名称修改
+     * @param cmptSetting
+     * @return
+     */
+    public int updCmptsettingName(CmptSetting cmptSetting) {
+        return cmptSettingMapper.updCmptsettingName(cmptSetting);
+    }
+}
\ No newline at end of file

src/main/java/com/dlbridge/jadp/plugins/cmpt/service/JoyfulCheckinRecordsService.java

+package com.dlbridge.jadp.plugins.cmpt.service;
+
+import com.dlbridge.jadp.plugins.cmpt.dao.mapper.JoyfulCheckinRecordsMapper;
+import com.dlbridge.jadp.plugins.cmpt.dao.model.JoyfulCheckinRecords;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 活动签到打卡记录
+ *
+ * @author LI
+ */
+@Service
+public class JoyfulCheckinRecordsService {
+
+    @Resource
+    JoyfulCheckinRecordsMapper joyfulCheckinRecordsMapper;
+
+    /**
+     * 活动签到打卡记录 追加
+     *
+     * @param joyfulCheckinRecords
+     * @return
+     */
+    public int insJoyfulCheckinRecords(JoyfulCheckinRecords joyfulCheckinRecords) {
+        return joyfulCheckinRecordsMapper.insJoyfulCheckinRecords(joyfulCheckinRecords);
+    }
+
+    /**
+     * 活动签到打卡记录 条件检索
+     *
+     * @param userId
+     * @param pageNo
+     * @param pageCount
+     * @return
+     */
+    public List<JoyfulCheckinRecords> getJoyfulCheckinRecordsList(String userId, int pageNo, int pageCount) {
+        int offset = PointService.getOffset(pageNo, pageCount);
+        List<JoyfulCheckinRecords> joyfulCheckinRecordsList = joyfulCheckinRecordsMapper.getJoyfulCheckinRecordsList(userId, offset, pageCount);
+        return joyfulCheckinRecordsList;
+    }
+}
\ No newline at end of file

src/main/java/com/dlbridge/jadp/plugins/cmpt/service/JoyfulRichTextService.java

+package com.dlbridge.jadp.plugins.cmpt.service;
+
+import com.dlbridge.jadp.plugins.cmpt.bean.JoyfulRichTextBean;
+import com.dlbridge.jadp.plugins.cmpt.dao.mapper.JoyfulRichTextMapper;
+import com.dlbridge.jadp.plugins.cmpt.dao.model.JoyfulRichText;
+import com.dlbridge.jadp.plugins.cmpt.utils.GpsUtil;
+import com.dlbridge.jadp.plugins.cmpt.utils.QRCodeUtil;
+import com.google.gson.Gson;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.awt.image.BufferedImage;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 积分信息
+ *
+ * @author LI
+ */
+@Service
+public class JoyfulRichTextService {
+
+    @Resource
+    JoyfulRichTextMapper joyfulRichTextMapper;
+
+    /**
+     * 悦行冬奥路富文本表 追加
+     *
+     * @param joyfulRichText
+     * @return
+     */
+    public int insJoyfulRichText(JoyfulRichText joyfulRichText) {
+        return joyfulRichTextMapper.insJoyfulRichText(joyfulRichText);
+    }
+
+    /**
+     * 悦行冬奥路富文本表 修改
+     *
+     * @param joyfulRichText
+     * @return
+     */
+    public int updJoyfulRichText(JoyfulRichText joyfulRichText) {
+        return joyfulRichTextMapper.updJoyfulRichText(joyfulRichText);
+    }
+
+    /**
+     * 悦行冬奥路富文本表 逻辑删除
+     *
+     * @param joyfulRichText
+     * @return
+     */
+    public int delJoyfulRichText(JoyfulRichText joyfulRichText) {
+        return joyfulRichTextMapper.delJoyfulRichText(joyfulRichText);
+    }
+
+    /**
+     * 悦行冬奥路富文本表 主键检索
+     *
+     * @param id
+     * @return
+     */
+    public JoyfulRichText getJoyfulRichText(String id) {
+        List<JoyfulRichText> joyfulRichTextList = joyfulRichTextMapper.getJoyfulRichTextById(id);
+        if (joyfulRichTextList.isEmpty()) {
+            return null;
+        }
+        return joyfulRichTextList.get(0);
+    }
+
+    /**
+     * 悦行冬奥路富文本表 条件检索
+     *
+     * @param joyfulRichTextBean
+     * @return
+     */
+    public List<JoyfulRichText> getJoyfulRichTextList(JoyfulRichTextBean joyfulRichTextBean) {
+        List<JoyfulRichText> joyfulRichTextList = joyfulRichTextMapper.getJoyfulRichTextList(joyfulRichTextBean.getType(), joyfulRichTextBean.getTitle());
+        if (StringUtils.isNotBlank(joyfulRichTextBean.getDistance())) {
+            joyfulRichTextList = joyfulRichTextList.stream().filter(model -> this.notGtDistance(model, joyfulRichTextBean)).collect(Collectors.toList());
+        }
+        return joyfulRichTextList;
+    }
+
+    /**
+     * 生成签到二维码
+     *
+     * @param id
+     * @return
+     */
+    public BufferedImage getJoyfulRichTextQrCode(int id) {
+        Map<String, Integer> map = new HashMap();
+        map.put("id", id);
+        Gson gson = new Gson();
+        String json = gson.toJson(map);
+        return QRCodeUtil.getBufferedImage(null, json);
+    }
+
+    private boolean notGtDistance(JoyfulRichText model, JoyfulRichTextBean bean) {
+        double distance = GpsUtil.getDistance(Double.parseDouble(model.getLat()), Double.parseDouble(model.getLng()), Double.parseDouble(bean.getLat()), Double.parseDouble(bean.getLng()));
+        return distance <= Double.parseDouble(bean.getDistance()) * 1000.0;
+    }
+
+    public static List subList(List list, int fromIndex, int toIndex) {
+        if (fromIndex < list.size()) {
+            if (toIndex < list.size()) {
+                return list.subList(fromIndex, toIndex);
+            } else {
+                return list.subList(fromIndex, list.size());
+            }
+        } else {
+            return new ArrayList();
+        }
+    }
+}
\ No newline at end of file

src/main/java/com/dlbridge/jadp/plugins/cmpt/service/PointService.java

+package com.dlbridge.jadp.plugins.cmpt.service;
+
+import com.dlbridge.jadp.plugins.cmpt.dao.mapper.UserPointMapper;
+import com.dlbridge.jadp.plugins.cmpt.dao.model.PointRecord;
+import com.dlbridge.jadp.plugins.cmpt.dao.model.UserPoint;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 积分信息
+ *
+ * @author LI
+ */
+@Service
+public class PointService {
+
+    // 0：获得积分
+    public static final String IS_NEGATIVE_0 = "0";
+    // 1：抵扣积分
+    public static final String IS_NEGATIVE_1 = "1";
+    @Resource
+    UserPointMapper userPointMapper;
+
+    /**
+     * 用户总积分
+     *
+     * @param userId
+     * @param isNegative 0：获得积分，1：抵扣积分
+     * @param pageNo
+     * @param pageCount
+     * @return
+     */
+    public UserPoint getUserPoint(String userId, String isNegative, int pageNo, int pageCount) {
+        List<UserPoint> userPointList = userPointMapper.getPoint(userId);
+        if (userPointList.isEmpty()) {
+            return null;
+        }
+        UserPoint userPoint = userPointList.get(0);
+        List<PointRecord> pointRecordList = this.getPointRecord(userId, isNegative, pageNo, pageCount);
+        userPoint.setPointRecordList(pointRecordList);
+        return userPoint;
+    }
+
+    /**
+     * 用户积分流水
+     *
+     * @param userId
+     * @param isNegative 0：获得积分，1：抵扣积分
+     * @param pageNo
+     * @param pageCount
+     */
+    public List<PointRecord> getPointRecord(String userId, String isNegative, int pageNo, int pageCount) {
+        int offset = getOffset(pageNo, pageCount);
+        return userPointMapper.getPointRecord(userId, isNegative, offset, pageCount);
+    }
+
+    public static int getOffset(int pageNo, int pageCount) {
+        pageNo = pageNo - 1;
+        if (pageNo < 0) {
+            pageNo = 0;
+        }
+        return pageNo * pageCount;
+    }
+}
\ No newline at end of file

src/main/java/com/dlbridge/jadp/plugins/cmpt/service/WeatherService.java

+package com.dlbridge.jadp.plugins.cmpt.service;
+
+import com.dlbridge.jadp.plugins.cmpt.utils.HttpUtil;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 天气信息
+ *
+ * @author LI
+ */
+@Service
+public class WeatherService {
+
+    private final String KEY = "H8S2C41LnZZJ2MKxOTD0r7jf1LBR4PIO";
+
+    /**
+     * 当前天气
+     *
+     * @param areacode
+     * @return
+     */
+    public Map<String, Object> getWeatherNow(String areacode) {
+        String url = "https://gfapi.mlogcn.com/weather/v001/now";
+        Map<String, String> map = new HashMap<>();
+        map.put("areacode", areacode);
+        map.put("key", KEY);
+        String json = HttpUtil.doGet(url, map);
+        return getWeather(json);
+    }
+
+    /**
+     * 近期天气
+     *
+     * @param areacode
+     * @param days
+     * @return
+     */
+    public Map<String, Object> getWeatherDay(String areacode, String days) {
+        String url = "https://gfapi.mlogcn.com/weather/v001/day";
+        Map<String, String> map = new HashMap<>();
+        map.put("areacode", areacode);
+        map.put("days", days);
+        map.put("key", KEY);
+        String json = HttpUtil.doGet(url, map);
+        return getWeather(json);
+    }
+
+    private static Map<String, Object> getWeather(String json) {
+        Gson gson = new Gson();
+        Map<String, Object> map = gson.fromJson(json, new TypeToken<Map<String, Object>>() {
+        }.getType());
+        map.replace("status", ((Double) map.get("status")).intValue());
+        return map;
+    }
+}
\ No newline at end of file

src/main/java/com/dlbridge/jadp/plugins/cmpt/utils/GpsUtil.java

+package com.dlbridge.jadp.plugins.cmpt.utils;
+
+/**
+ * <p>
+ * 百度地图计算两坐标点之间距离计算
+ * </p>
+ *
+ * @author Linc
+ * @since 2021/12/21
+ */
+public class GpsUtil {
+	private static double DEF_PI = 3.14159265359; // PI
+	private static double DEF_2PI = 6.28318530712; // 2*PI
+	private static double DEF_PI180 = 0.01745329252; // PI/180.0
+	public static double DEF_R = 6370693.5; // radius of earth
+
+	/**
+	 * 两个经纬度点之间的距离。适用于近距离,单位m
+	 *
+	 * @param lng1 经度1
+	 * @param lat1 纬度1
+	 * @param lng2 经度2
+	 * @param lat2 纬度2
+	 * @return
+	 */
+	public static double getShortDistance(double lng1, double lat1, double lng2, double lat2) {
+		double ew1, ns1, ew2, ns2;
+		double dx, dy, dew;
+		double distance;
+		// 角度转换为弧度
+		ew1 = lng1 * DEF_PI180;
+		ns1 = lat1 * DEF_PI180;
+		ew2 = lng2 * DEF_PI180;
+		ns2 = lat2 * DEF_PI180;
+		// 经度差
+		dew = ew1 - ew2;
+		// 若跨东经和西经180 度，进行调整
+		if (dew > DEF_PI)
+			dew = DEF_2PI - dew;
+		else if (dew < -DEF_PI)
+			dew = DEF_2PI + dew;
+		dx = DEF_R * Math.cos(ns1) * dew; // 东西方向长度(在纬度圈上的投影长度)
+		dy = DEF_R * (ns1 - ns2); // 南北方向长度(在经度圈上的投影长度)
+		// 勾股定理求斜边长
+		distance = Math.sqrt(dx * dx + dy * dy);
+		return distance;
+	}
+
+	/**
+	 * 适用于远距离
+	 *
+	 * @param lon1
+	 * @param lat1
+	 * @param lon2
+	 * @param lat2
+	 * @return
+	 */
+	public static double getLongDistance(double lon1, double lat1, double lon2, double lat2) {
+		double ew1, ns1, ew2, ns2;
+		double distance;
+		// 角度转换为弧度
+		ew1 = lon1 * DEF_PI180;
+		ns1 = lat1 * DEF_PI180;
+		ew2 = lon2 * DEF_PI180;
+		ns2 = lat2 * DEF_PI180;
+		// 求大圆劣弧与球心所夹的角(弧度)
+		distance = Math.sin(ns1) * Math.sin(ns2) + Math.cos(ns1) * Math.cos(ns2) * Math.cos(ew1 - ew2);
+		// 调整到[-1..1]范围内，避免溢出
+		if (distance > 1.0)
+			distance = 1.0;
+		else if (distance < -1.0)
+			distance = -1.0;
+		// 求大圆劣弧长度
+		distance = DEF_R * Math.acos(distance);
+		return distance;
+	}
+
+	/**
+	 * 计算两点的经纬度距离
+	 * 不要在意怎么算的 合并过的
+	 * 减少内存的回收
+	 *
+	 * @param lat1
+	 * @param lng1
+	 * @param lat2
+	 * @param lng2
+	 * @return 单位 米
+	 */
+	public static double getDistance(double lat1, double lng1, double lat2, double lng2) {
+	    double a, b, R = 6378137; // 地球半径
+	    lat1 = lat1 * Math.PI / 180.0;
+	    lat2 = lat2 * Math.PI / 180.0;
+	    a = lat1 - lat2;
+	    b = (lng1 - lng2) * Math.PI / 180.0;
+	    return 2
+	            * R
+	            * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2.0), 2) + Math.cos(lat1)
+	            * Math.cos(lat2) * Math.pow(Math.sin(b / 2.0), 2)));
+	}
+
+	public static void main(String[] args) {
+		double mLat1 = 40.839055962860584; // point1纬度
+		double mLon1 = 115.37932204082608; // point1经度
+		double mLat2 = 40.871667684987187;// point2纬度
+		double mLon2 = 115.42866764590144;// point2经度
+		double distance = GpsUtil.getShortDistance(mLon1, mLat1, mLon2, mLat2);
+		double distance2 = GpsUtil.getDistance(mLat1,mLon1, mLat2, mLon2 );
+		System.out.println(distance);
+		System.out.println(distance2);
+//		double distance2 = GpsUtil.getLongDistance(mLon1, mLat1, mLon2, mLat2);
+//		System.out.println(distance2);
+	}
+
+}
\ No newline at end of file

src/main/java/com/dlbridge/jadp/plugins/cmpt/web/JoyfulRoadController.java

+package com.dlbridge.jadp.plugins.cmpt.web;
+
+import com.dlbridge.jadp.plugins.cmpt.bean.JoyfulRichTextBean;
+import com.dlbridge.jadp.plugins.cmpt.dao.model.CmptSetting;
+import com.dlbridge.jadp.plugins.cmpt.dao.model.JoyfulCheckinRecords;
+import com.dlbridge.jadp.plugins.cmpt.dao.model.JoyfulRichText;
+import com.dlbridge.jadp.plugins.cmpt.dao.model.UserPoint;
+import com.dlbridge.jadp.plugins.cmpt.service.*;
+import com.neusoft.www.utils.web.Result;
+import io.swagger.annotations.*;
+import lombok.extern.log4j.Log4j2;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.imageio.ImageIO;
+import javax.servlet.http.HttpServletResponse;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.List;
+import java.util.Map;
+
+@Log4j2
+@RestController
+@RequestMapping(value = "api/joyfulRoad")
+@Api(value = "悦行冬奥路", tags = "悦行冬奥路")
+@ApiSort(10)
+public class JoyfulRoadController {
+
+    @Resource
+    private CmptSettingService cmptSettingService;
+
+
+    @Resource
+    private JoyfulCheckinRecordsService joyfulCheckinRecordsService;
+
+    @Resource
+    private JoyfulRichTextService joyfulRichTextService;
+
+    @Resource
+    private PointService pointService;
+
+    @Resource
+    private WeatherService weatherService;
+
+    @PostMapping(value = "/updCmptsettingName")
+    @ResponseBody
+    @ApiOperation(value = "模块名称修改", notes = "模块名称修改", tags = "模块名称修改")
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "成功"),
+            @ApiResponse(code = -1, message = "失败", response = ObjectUtils.Null.class)})
+    @ApiImplicitParams({
+            @ApiImplicitParam(value = "赛事ID", name = "cmptId", required = true, paramType = "body"),
+            @ApiImplicitParam(value = "type", name = "type", required = true, paramType = "body"),
+            @ApiImplicitParam(value = "活动名字", name = "name", required = true, paramType = "body"),
+            @ApiImplicitParam(value = "更新者", name = "updateById", required = true, paramType = "body")})
+    public Result updCmptsettingName(@RequestBody CmptSetting cmptSetting) {
+        if (StringUtils.isBlank(cmptSetting.getName())) {
+            return Result.fail().setMsg("请输入模块名称！");
+        } else if (StringUtils.length(cmptSetting.getName()) > 30) {
+            return Result.fail().setMsg("请输入的模块名称在30字以下！");
+        }
+        int count = cmptSettingService.updCmptsettingName(cmptSetting);
+        if (count > 0) {
+            return Result.success().setMsg("更新成功！");
+        } else {
+            return Result.fail().setMsg("更新失败！");
+        }
+    }
+
+    @GetMapping(value = "/getWeatherNow/{areacode}")
+    @ApiOperation(value = "当前天气", notes = "当前天气", tags = "当前天气")
+    @ApiImplicitParam(value = "地区编码", name = "areacode", required = true, paramType = "path", defaultValue = "101090301")
+    public Result<Map<String, Object>> getWeatherNow(@PathVariable("areacode") String areacode) {
+        Map<String, Object> map = weatherService.getWeatherNow(areacode);
+        return Result.success().setContent(map);
+    }
+
+    @GetMapping(value = "/getWeatherDay/{areacode}/{days}")
+    @ApiOperation(value = "近期天气", notes = "近期天气", tags = "近期天气")
+    @ApiImplicitParams({
+            @ApiImplicitParam(value = "地区编码", name = "areacode", required = true, paramType = "path", defaultValue = "101090301"),
+            @ApiImplicitParam(value = "未来天数", name = "days", required = true, paramType = "path", defaultValue = "3")})
+    public Result<Map<String, Object>> getWeatherDay(@PathVariable("areacode") String areacode, @PathVariable("days") String days) {
+        Map<String, Object> map = weatherService.getWeatherDay(areacode, days);
+        return Result.success().setContent(map);
+    }
+
+    @GetMapping(value = "/earnPointsInfo/{userId}/{pageNo}/{pageCount}")
+    @ApiOperation(value = "积分增加流水", notes = "积分增加流水", tags = "积分增加流水")
+    public Result<UserPoint> earnPointsInfo(@PathVariable("userId") String userId, @PathVariable("pageNo") int pageNo, @PathVariable("pageCount") int pageCount) {
+        UserPoint userPoint = pointService.getUserPoint(userId, PointService.IS_NEGATIVE_0, pageNo, pageCount);
+        if (userPoint == null) {
+            Result.fail().setMsg("用户积分信息不存在！");
+        }
+        return Result.success().setContent(userPoint);
+    }
+
+    @GetMapping(value = "/redeemPointsInfo/{userId}/{pageNo}/{pageCount}")
+    @ApiOperation(value = "积分减少流水", notes = "积分减少流水", tags = "积分减少流水")
+    public Result<UserPoint> redeemPointsInfo(@PathVariable("userId") String userId, @PathVariable("pageNo") int pageNo, @PathVariable("pageCount") int pageCount) {
+        UserPoint userPoint = pointService.getUserPoint(userId, PointService.IS_NEGATIVE_1, pageNo, pageCount);
+        if (userPoint == null) {
+            Result.fail().setMsg("用户积分信息不存在！");
+        }
+        return Result.success().setContent(userPoint);
+    }
+
+    @PostMapping(value = "/insJoyfulRichText")
+    @ApiOperation(value = "自助服务管理新增", notes = "自助服务管理新增", tags = "自助服务管理新增")
+    public Result insJoyfulRichText(@RequestBody JoyfulRichText joyfulRichText) {
+        int result = joyfulRichTextService.insJoyfulRichText(joyfulRichText);
+        if (result != 1) {
+            return Result.fail().setMsg("新增失败！");
+        }
+        return Result.success().setMsg("新增成功。");
+    }
+
+    @PostMapping(value = "/updJoyfulRichText")
+    @ApiOperation(value = "自助服务管理修改", notes = "自助服务管理修改", tags = "自助服务管理修改")
+    public Result updJoyfulRichText(@RequestBody JoyfulRichText joyfulRichText) {
+        int result = joyfulRichTextService.updJoyfulRichText(joyfulRichText);
+        if (result != 1) {
+            return Result.fail().setMsg("修改失败！");
+        }
+        return Result.success().setMsg("修改成功。");
+    }
+
+    @PostMapping(value = "/delJoyfulRichText")
+    @ApiOperation(value = "自助服务管理删除", notes = "自助服务管理删除", tags = "自助服务管理删除")
+    public Result delJoyfulRichText(@RequestBody JoyfulRichText joyfulRichText) {
+        int result = joyfulRichTextService.delJoyfulRichText(joyfulRichText);
+        if (result != 1) {
+            return Result.fail().setMsg("删除失败！");
+        }
+        return Result.success().setMsg("删除成功。");
+    }
+
+    @GetMapping(value = "/getJoyfulRichText/{id}")
+    @ApiOperation(value = "自助服务管理主键检索", notes = "自助服务管理主键检索", tags = "自助服务管理主键检索")
+    public Result<JoyfulRichText> getJoyfulRichText(@PathVariable("id") String id) {
+        JoyfulRichText joyfulRichText = joyfulRichTextService.getJoyfulRichText(id);
+        if (joyfulRichText == null) {
+            return Result.fail().setMsg("数据不存在。");
+        }
+        return Result.success().setContent(joyfulRichText);
+    }
+
+    @PostMapping(value = "/getJoyfulRichTextList/{pageNo}/{pageCount}")
+    @ApiOperation(value = "自助服务管理条件检索", notes = "自助服务管理条件检索", tags = "自助服务管理条件检索")
+    public Result<List<JoyfulRichText>> getJoyfulRichTextList(@RequestBody JoyfulRichTextBean joyfulRichTextBean, @PathVariable("pageNo") int pageNo, @PathVariable("pageCount") int pageCount) {
+        if (StringUtils.isNotBlank(joyfulRichTextBean.getType())) {
+        } else if (StringUtils.isNotBlank(joyfulRichTextBean.getTitle())) {
+        } else if (StringUtils.isNotBlank(joyfulRichTextBean.getDistance()) && StringUtils.isNotBlank(joyfulRichTextBean.getLng()) && StringUtils.isNotBlank(joyfulRichTextBean.getLat())) {
+        } else {
+            return Result.fail().setMsg("请输入检索条件。");
+        }
+        List<JoyfulRichText> joyfulRichTextList = joyfulRichTextService.getJoyfulRichTextList(joyfulRichTextBean);
+        int fromIndex = pointService.getOffset(pageNo, pageCount);
+        joyfulRichTextList = JoyfulRichTextService.subList(joyfulRichTextList, fromIndex, fromIndex + pageCount);
+        return Result.success().setContent(joyfulRichTextList);
+    }
+
+    @GetMapping(value = "/getJoyfulRichText/qrCode/{id}")
+    @ApiOperation(value = "生成签到二维码", notes = "生成签到二维码", tags = "生成签到二维码")
+    public void getJoyfulRichTextQrCode(@PathVariable("id") int id, HttpServletResponse response) {
+        response.setContentType("image/png");
+        response.setHeader("Pragma", "no-cache");
+        response.setHeader("Cache-Control", "no-cache");
+        response.setDateHeader("Expires", 0);
+        try {
+            OutputStream os = response.getOutputStream();
+            BufferedImage buffImg = joyfulRichTextService.getJoyfulRichTextQrCode(id);
+            ImageIO.write(buffImg, "png", os);
+        } catch (IOException e) {
+            log.info(e.getMessage(), e);
+        }
+    }
+
+    @PostMapping(value = "/insJoyfulCheckinRecords")
+    @ApiOperation(value = "活动签到打卡", notes = "活动签到打卡", tags = "活动签到打卡")
+    public Result insJoyfulCheckinRecords(@RequestBody JoyfulCheckinRecords joyfulCheckinRecords){
+        int result = joyfulCheckinRecordsService.insJoyfulCheckinRecords(joyfulCheckinRecords);
+        if (result != 1) {
+            return Result.fail().setMsg("新增失败！");
+        }
+        return Result.success().setMsg("新增成功。");
+    }
+
+    @GetMapping(value = "/getJoyfulCheckinRecordsList/{userId}/{pageNo}/{pageCount}")
+    @ApiOperation(value = "活动签到打卡记录", notes = "活动签到打卡记录", tags = "活动签到打卡记录")
+    public Result<List<JoyfulCheckinRecords>> getJoyfulCheckinRecordsList(@PathVariable("userId") String userId, @PathVariable("pageNo") int pageNo, @PathVariable("pageCount") int pageCount){
+        List<JoyfulCheckinRecords> joyfulCheckinRecordsList = joyfulCheckinRecordsService.getJoyfulCheckinRecordsList(userId, pageNo, pageCount);
+        return Result.success().setContent(joyfulCheckinRecordsList);
+    }
+}
\ No newline at end of file

src/main/java/com/dlbridge/jadp/plugins/cmpt/web/MicroApiController.java

@@ -630,10 +630,10 @@ public class MicroApiController {
                 if(jsoninfo.getString("unionId") != null &&
                         !"null".equals(jsoninfo.getString("unionId"))){
                     url = geexekURL + "registerInfo/saveOrUpdateByUnionId.do?unionId=" + jsoninfo.getString("unionId") +
-                            "&userName=" + name + "&nickName=" + name + "&headImgUrl=" + imgUrl + "&userFrom=3";
+                            "&userName=" + name + "&nickName=" + name  + "&userFrom=3";
                 }else{
                     url = geexekURL + "registerInfo/saveOrUpdateByOpenId.do?openId=" + openid +
-                            "&userName=" + name + "&nickName=" + name + "&headImgUrl=" + imgUrl + "&userFrom=3";
+                            "&userName=" + name + "&nickName=" + name  + "&userFrom=3";
                 }
 
                 log.info("=====请求的URL:" + url);

src/main/resources/application-dev.properties

@@ -13,7 +13,7 @@ mybatis.mapperLocations=classpath:com/dlbridge/jadp/plugins/**/**.xml
 mybatis.configuration.map-underscore-to-camel-case=true
 mybatis.configuration.jdbc-type-for-null=null
 spring.profiles.active=dev
-server.port=9090
+server.port=9802
 charset_name=UTF-8
 #\u8BBE\u7F6E\u73AF\u5883\u914D\u7F6E
 #spring.profiles.active=dev