Merge branch 'haucheng_panzhihua' into huacheng_test

101captain

2022-08-08 0738bc12a588778c40c21a1874048c485f360ce1

Merge branch 'haucheng_panzhihua' into huacheng_test

# Conflicts:
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActIntegralUserDOMapper.xml

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ConvenientServiceCategoryDAO.java

@@ -37,7 +37,7 @@
     * @param createdBy
     * @return
     */
    int createMerchantServiceRelation(@Param("merchantId") Long merchantId, @Param("serviceId") Long serviceId,
    int createMerchantServiceRelation(@Param("id")Long id,@Param("merchantId") Long merchantId, @Param("serviceId") Long serviceId,
                                      @Param("name") String name, @Param("createdBy") Long createdBy);

    /**

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java

@@ -12,6 +12,7 @@

import javax.annotation.Resource;

import com.panzhihua.common.utlis.Snowflake;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -111,7 +112,7 @@
                List<Long> serviceIds = convenientMerchantDTO.getServiceIds();
                serviceIds.forEach(serviceId -> {
                    ConvenientServiceCategoryDO convenientServiceCategoryDO = convenientServiceCategoryDAO.selectById(serviceId);
                    convenientServiceCategoryDAO.createMerchantServiceRelation(merchantId, serviceId,
                    convenientServiceCategoryDAO.createMerchantServiceRelation(Snowflake.getId(),merchantId, serviceId,
                            convenientServiceCategoryDO.getName(), convenientMerchantDTO.getCreatedBy());
                });
            }
@@ -159,7 +160,7 @@
            convenientServiceCategoryDAO.deleteMerchantServiceRelation(merchantId);
            serviceIds.forEach(serviceId -> {
                ConvenientServiceCategoryDO convenientServiceCategoryDO = convenientServiceCategoryDAO.selectById(serviceId);
                convenientServiceCategoryDAO.createMerchantServiceRelation(merchantId, serviceId,
                convenientServiceCategoryDAO.createMerchantServiceRelation(Snowflake.getId(),merchantId, serviceId,
                        convenientServiceCategoryDO.getName(), convenientMerchantDTO.getCreatedBy());
            });
        }

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoDOMapper.xml

@@ -393,14 +393,14 @@
    <select id="selectIndexEasyPhotoBaseData"
            resultType="com.panzhihua.common.model.vos.community.bigscreen.BigScreenEasyPhotoStatisticsInfo">
        SELECT
        (SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id = ${communityId} AND `status` IN(4,5) AND del_tag = 0 AND classify_id IN (1,3,4,5,6,7,8)) AS eventDealTotal,
        (SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id = ${communityId} AND `status` IN(4,5) AND del_tag = 0 AND classify_id = 7) AS eventTFDeal,
        (SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id = ${communityId} AND `status` IN(4,5) AND del_tag = 0 AND classify_id = 4) AS eventZADeal,
        (SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id = ${communityId} AND `status` IN(4,5) AND del_tag = 0 AND classify_id = 5) AS eventMDDeal,
        (SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id = ${communityId} AND `status` IN(4,5) AND del_tag = 0 AND classify_id = 3) AS eventTSDeal,
        (SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id = ${communityId} AND `status` IN(4,5) AND del_tag = 0 AND classify_id = 6) AS eventMSDeal,
        (SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id = ${communityId} AND `status` IN(4,5) AND del_tag = 0 AND classify_id = 8) AS eventFJDeal,
        (SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id = ${communityId} AND `status` IN(4,5) AND del_tag = 0 AND classify_id = 1) AS otherDeal
        (SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id = ${communityId} AND `status` IN(4,5) AND del_tag = 0 AND classify_id IN (1552663338578743296,1552663345243492353,1552663345524510720,1552663345570648064,1552663345683894273,1552663345751003136,1552663345885220866)) AS eventDealTotal,
        (SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id = ${communityId} AND `status` IN(4,5) AND del_tag = 0 AND classify_id = 1552663345751003136) AS eventTFDeal,
        (SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id = ${communityId} AND `status` IN(4,5) AND del_tag = 0 AND classify_id = 1552663345524510720) AS eventZADeal,
        (SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id = ${communityId} AND `status` IN(4,5) AND del_tag = 0 AND classify_id = 1552663345570648064) AS eventMDDeal,
        (SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id = ${communityId} AND `status` IN(4,5) AND del_tag = 0 AND classify_id = 1552663345243492353) AS eventTSDeal,
        (SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id = ${communityId} AND `status` IN(4,5) AND del_tag = 0 AND classify_id = 1552663345683894273) AS eventMSDeal,
        (SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id = ${communityId} AND `status` IN(4,5) AND del_tag = 0 AND classify_id = 1552663345885220866) AS eventFJDeal,
        (SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id = ${communityId} AND `status` IN(4,5) AND del_tag = 0 AND classify_id = 1552663338578743296) AS otherDeal
    </select>
    <select id="getEasyPhotoAddPolylineData"
            resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO">

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ConvenientServiceCategoryMapper.xml

@@ -21,8 +21,8 @@
    id,`name`,icon,remark,weight,is_del,created_at,created_by,updated_at,updated_by
    </sql>
    <insert id="createMerchantServiceRelation">
        INSERT INTO com_convenient_service_scope (merchant_id, service_category_id, service_name, created_by, created_at)
        VALUES (#{merchantId}, #{serviceId}, #{name}, #{createdBy}, NOW())
        INSERT INTO com_convenient_service_scope (id,merchant_id, service_category_id, service_name, created_by, created_at)
        VALUES (#{id},#{merchantId}, #{serviceId}, #{name}, #{createdBy}, NOW())
    </insert>
    <delete id="deleteMerchantServiceRelation">
        DELETE FROM com_convenient_service_scope WHERE merchant_id = #{merchantId}

 springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/java/com/panzhihua/timejob/jobhandler/CommunityJobHandler.java

@@ -39,6 +39,20 @@

    /**
     * 定时任务刷新社区动态置顶状态
     *
     * @return 刷新个数
     * @throws Exception
     *             出现的异常
     */
    @XxlJob("test")
    public ReturnT<String> test(String param) throws Exception {
        log.info("定时测试");
        log.info("执行结果【{}】", "sucess");
        return ReturnT.SUCCESS;
    }

    /**
     * 定时任务刷新社区动态置顶状态
     * 
     * @return 刷新个数
     * @throws Exception

 springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/resources/bootstrap.yml

@@ -5,7 +5,7 @@
    config:
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
        service-id: huacheng-config  # 注册中心的服务名
      profile: ${ENV:dev}  # 指定配置文件的环境
      uri: http://${CONFIG_URL:localhost}:6193/
  profiles:
@@ -29,5 +29,5 @@

  metrics:
    tags:
      application: timejob
      application: huacheng-timejob