更新最新代码

pom.xml

@@ -21,7 +21,7 @@
         <thymeleaf.version>3.0.0.RELEASE</thymeleaf.version>
         <thymeleaf-layout-dialect.version>2.0.0</thymeleaf-layout-dialect.version>
         <shiro.version>1.3.2</shiro.version>
-<!--        <poi.version>3.9</poi.version>-->
+        <poi.version>3.9</poi.version>
         <thymeleaf-shiro.version>2.0.0</thymeleaf-shiro.version>
         <hutool.version>2.16.0</hutool.version>
         <commons-io.version>2.4</commons-io.version>
@@ -53,9 +53,9 @@
 
     <dependencies>
         <!--<dependency>-->
-        <!--<groupId>org.flywaydb</groupId>-->
-        <!--<artifactId>flyway-core</artifactId>-->
-        <!--<version>5.0.3</version>-->
+            <!--<groupId>org.flywaydb</groupId>-->
+            <!--<artifactId>flyway-core</artifactId>-->
+            <!--<version>5.0.3</version>-->
         <!--</dependency>-->
 
         <!--web支持-->
@@ -75,8 +75,8 @@
             <!--<scope>complie</scope>-->
         </dependency>
         <!--<dependency>-->
-        <!--<groupId>org.springframework.boot</groupId>-->
-        <!--<artifactId>spring-boot-starter-security</artifactId>-->
+            <!--<groupId>org.springframework.boot</groupId>-->
+            <!--<artifactId>spring-boot-starter-security</artifactId>-->
         <!--</dependency>-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -244,21 +244,21 @@
             <version>1.2.44</version>
         </dependency>
         <!-- poi office -->
-<!--        <dependency>-->
-<!--            <groupId>org.apache.poi</groupId>-->
-<!--            <artifactId>poi</artifactId>-->
-<!--            <version>${poi.version}</version>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>org.apache.poi</groupId>-->
-<!--            <artifactId>poi-ooxml</artifactId>-->
-<!--            <version>${poi.version}</version>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>org.apache.poi</groupId>-->
-<!--            <artifactId>poi-ooxml-schemas</artifactId>-->
-<!--            <version>${poi.version}</version>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>${poi.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>${poi.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml-schemas</artifactId>
+            <version>${poi.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -279,11 +279,6 @@
             <version>${springfox.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15on</artifactId>
-            <version>1.63</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
@@ -312,18 +307,18 @@
             <artifactId>springloaded</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-            <version>2.7</version>
-        </dependency>
+		<dependency>
+		    <groupId>com.google.code.gson</groupId>
+		    <artifactId>gson</artifactId>
+		    <version>2.7</version>
+		</dependency>
 
-        <!-- httpclient 上传文件至文件服务器 -->
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpmime</artifactId>
-            <version>4.5.2</version>
-        </dependency>
+		<!-- httpclient 上传文件至文件服务器 -->
+		<dependency>
+		    <groupId>org.apache.httpcomponents</groupId>
+		    <artifactId>httpmime</artifactId>
+		    <version>4.5.2</version>
+		</dependency>
 
         <!-- 阿里大鱼短信 -->
         <dependency>
@@ -351,19 +346,6 @@
             <version>2.8.2</version>
         </dependency>
 
-
-        <!-- https://mvnrepository.com/artifact/org.jxls/jxls -->
-        <dependency>
-            <groupId>org.jxls</groupId>
-            <artifactId>jxls</artifactId>
-            <version>2.4.7</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>easyexcel</artifactId>
-            <version>2.1.6</version>
-        </dependency>
     </dependencies>
 
     <build>

src/main/java/platform/common/Constant.java

@@ -63,7 +63,7 @@ public final class Constant {
     }
 
     public static final class UserType {
-        //0政府，1园区，2超级管理员,3企业,4街道,5个人,6微信获取）
+        //0政府，1园区，2超级管理员,3企业,4街道）
         public static Integer SYSTEM = -1;
         public static Integer GOVERNMENT = 0;
         public static Integer BUILD = 1;
@@ -71,7 +71,6 @@ public final class Constant {
         public static Integer COMPANY = 3;
         public static Integer STREET = 4;
         public static Integer PERSONAL = 5;
-        public static Integer WECHAT = 6;
     }
 
     public static final class DictType {
@@ -165,18 +164,6 @@ public final class Constant {
         public static String INDUSTRIAL_STREET_UPLOAD = "INDUSTRIAL_STREET_UPLOAD"; //工业载体资料上传
         public static String INDUSTRIAL_PARK_UPLOAD = "INDUSTRIAL_PARK_UPLOAD"; //工业载体资料上传
 
-        public static String INDUSTRIAL_LAND_SUPPLY = "INDUSTRIAL_LAND_SUPPLY";//产业供地基础附件
-        public static String INDUSTRIAL_LAND_SUPPLY_FEEDBACK = "INDUSTRIAL_LAND_SUPPLY_FEEDBACK";//产业供地反馈咨询附件
-        public static String INDUSTRIAL_LAND_SUPPLY_SUMMARY = "INDUSTRIAL_LAND_SUPPLY_SUMMARY";//产业供地咨询汇总附件
-        public static String INDUSTRIAL_LAND_SUPPLY_COMMERCE_SUPPLEMENT = "INDUSTRIAL_LAND_SUPPLY_COMMERCE_SUPPLEMENT";//产业供地商业业务员补充附件
-        public static String INDUSTRIAL_LAND_SUPPLY_COMMERCE_LEADER = "INDUSTRIAL_LAND_SUPPLY_COMMERCE_LEADER";//产业供地商务领导审核附件
-        public static String INDUSTRIAL_LAND_SUPPLY_MANAGEMENT_COMMITTEE_LEADER = "INDUSTRIAL_LAND_SUPPLY_MANAGEMENT_COMMITTEE_LEADER";//产业供地管委会领导审核附件
-        public static String INDUSTRIAL_LAND_SUPPLY_DISTRIBUTE = "INDUSTRIAL_LAND_SUPPLY_DISTRIBUTE";//产业供地分发附件
-        public static String INDUSTRIAL_LAND_SUPPLY_DISTRIBUTE_FEEDBACK = "INDUSTRIAL_LAND_SUPPLY_DISTRIBUTE_FEEDBACK";//产业供地分发反馈附件
-        public static String INDUSTRIAL_LAND_SUPPLY_DISTRIBUTE_SUMMARY = "INDUSTRIAL_LAND_SUPPLY_DISTRIBUTE_SUMMARY";//产业供地分发汇总附件
-        public static String INDUSTRIAL_LAND_SUPPLY_JOINT_TRIAL = "INDUSTRIAL_LAND_SUPPLY_JOINT_TRIAL";//产业供地分发会审附件
-        public static String INDUSTRIAL_LAND_SUPPLY_APPROVE = "INDUSTRIAL_LAND_SUPPLY_APPROVE";//产业供地供地审核
-        public static String INDUSTRIAL_LAND_SUPPLY_FINAL= "INDUSTRIAL_LAND_SUPPLY_FINAL";//产业供地供地最终信息
     }
 
     public static final class Navigation_Id {
@@ -334,12 +321,6 @@ public final class Constant {
 
         public static String FILE_UPLOAD_TYPE = "工业载体资料上传";
 
-        public static String INDUSTRIAL_LAND_SUPPLY = "产业供地";
-
-        public static String INDUSTRIAL_LAND_SUPPLY_APPROVE_STATUS = "产业供地审核状态";
-
-        public static String INDUSTRIAL_LAND_SUPPLY_APPROVE_STAGE = "产业供地审核阶段";
-
     }
 
     public static final class LandApplyType {
@@ -370,72 +351,16 @@ public final class Constant {
         public static String TWICE_UNITED_AUDIT = "5"; //二次联合评议
         public static String GOVERNMENT_AUDIT = "6"; //区政府审核
         public static String REJECT = "7"; //退回
-        public static String APPROVED = "8"; //通过（手续办理） 基本最终状态都是这种数据
+        public static String APPROVED = "8"; //通过（手续办理）
         public static String NOTAPPROVED = "9"; //不通过
-        //        public static String JYLCAPPROVAL = "10"; //简易流程通过
+        public static String JYLCAPPROVAL = "10"; //简易流程通过
         public static String HGXSCTG = "11"; //合规性审查汇总
-        public static String PASSED = "12"; //通过（手续办理通过） 这种状态只有一条数据
-        public static String NOTPASSED = "13"; //通过（手续办理不通过） 这种状态没有数据
+        public static String PASSED = "12"; //通过（手续办理通过）
+        public static String NOTPASSED = "13"; //通过（手续办理不通过）
 
-        // 2020-01-10 wj 简易流程会签 改为 简易流程办理中
         public static String JYLCHQ = "14"; //简易流程会签
         public static String JYLCHZ = "15"; //简易流程汇总
-        // 2020-01-14 wj 简易流程结果
-        public static String EASY_PROCESS_APPROVED = "80"; // 简易流程通过
-        public static String EASY_PROCESS_DENY = "90"; // 简易流程不通过
-
-    }
-
-    public static final class LandSupplyApproveStatus {
-        //产业供地审核状态
-        // 项目预审阶段：
-        // 1：待提交商务（属地草稿）
-        // 2: 待商务处理（属地提交）
-        // 3：已撤回（属地撤回）
-        // 4：已退回板块（商务办事员退回）
-        // 5：待提交（商务办事员草稿）
-        // 6：待反馈（商务办事员咨询并提交）
-        // 7：待汇总（商务办事员咨询完成）
-        // 8：商务局分管领导待审核（商务办事员汇总完成）
-        // 9：商务局分管领导退回（商务办事员汇总完成）
-        // 10：商务局分管领导不通过（商务办事员汇总完成）
-        // 项目供地阶段：
-        // 11：管委会分管领导退回（商务局分管领导通过）
-        // 12：管委会分管领导不通过（商务局分管领导通过）
-
-        public static String PLATE_PENDING_SUBMIT = "1"; //待提交商务（属地草稿）
-        public static String COMMERCE_PENDING_HANDLE = "2"; //待商务处理（属地提交）
-        public static String PLATE_WITHDRAW = "3"; //已撤回（属地撤回）
-        public static String COMMERCE_RETURN = "4"; //已退回板块（商务办事员退回）
-        public static String COMMERCE_PENDING_SUBMIT = "5"; //待提交（商务办事员草稿）
-        public static String COMMERCE_PENDING_FEEDBACK = "6"; //待反馈（商务办事员咨询并提交）
-        public static String COMMERCE_PENDING_SUMMARY = "7"; //待汇总（商务办事员咨询完成）
-        public static String COMMERCE_LEADER_PENDING_HANDLE = "8"; //商务局分管领导待审核（商务办事员汇总完成）
-        public static String COMMERCE_LEADER_RETURN = "9"; //商务局分管领导退回（商务办事员汇总完成）
-        public static String COMMERCE_LEADER_REJECT = "10"; //商务局分管领导不通过（商务办事员汇总完成）
-
-        public static String MANAGEMENT_COMMITTEE_LEADER_PENDING_HANDLE = "11"; //待预审审核（商务局分管领导通过）
-        public static String MANAGEMENT_COMMITTEE_LEADER_RETURN = "12"; //预审退回（商务局分管领导通过）
-        public static String MANAGEMENT_COMMITTEE_LEADER_REJECT = "13"; //预审不通过（商务局分管领导不通过）
-        public static String PRE_APPROVE_PENDIND_DISTRIBUTE = "14"; //预审通过待分发（预审通过）
-
-        public static String LAND_SUPPLY_PENDIND_FEEDBACK = "15"; //供地分发待反馈（预审通过待分发）
-        public static String LAND_SUPPLY_PENDIND_SUMMARY = "16"; //供地分发待汇总（供地分发待反馈）
-
-        public static String LAND_SUPPLY_LEADER_PENDIND_HANDLE = "17"; //待供地审批（供地分发待汇总）
-
-        public static String LAND_SUPPLY_LEADER_PASS = "18"; //供地通过（待供地审批）
-        public static String LAND_SUPPLY_LEADER_REJECT = "19"; //供不通过（待供地审批）
-        public static String LAND_SUPPLY_LEADER_RETURN = "20"; //供地退回（待供地审批）
-    }
-
-    public static final class LandSupplyApproveStage {
-        //产业供地审核状态
-        // 1：项目预审
-        // 2: 项目供地
-
-        public static String PRE_AUDIT = "1"; //项目预审
-        public static String SUPPLY = "2"; //项目供地
+
     }
 
     public static final class ProjectApplicationStatus {
@@ -538,8 +463,6 @@ public final class Constant {
         public static String PENDING = "待审核";
         public static String NOTIFY = "通知";
         public static String DISTRIBUTE = "分发各部门";
-        public static String WITHDRAW = "撤回";
-        public static String FINAL = "最终信息";
     }
 
     public static final class WaitToDo_OperType {
@@ -661,15 +584,6 @@ public final class Constant {
     public static final String INDUSTRIALLAND_PREAUDIT = "产业用地预审办";
     public static final String INDUSTRIALLAND_DEPT = "产业用地评审组";
 
-    public static final String INDUSTRIALLANDSUPPLY_1 = "商务局受理员";
-    public static final String INDUSTRIALLANDSUPPLY_2 = "待咨询局办";
-    public static final String INDUSTRIALLANDSUPPLY_3 = "商务局分管领导";
-    public static final String INDUSTRIALLANDSUPPLY_4 = "管委会分管领导";
-    public static final String INDUSTRIALLANDSUPPLY_5 = "待分发局办";
-    public static final String INDUSTRIALLANDSUPPLY_6 = "行政审批局";
-    public static final String INDUSTRIALLANDSUPPLY_7 = "资源规划局";
-//    public static final String INDUSTRIALLANDSUPPLY_8 = "产业用地分管领导";
-
     public static final class Message_Business_type {
         //消息业务类型
         public static String STOCKLAND = "1";
@@ -965,13 +879,13 @@ public final class Constant {
     /**
      * jwt错误类型
      */
-    public static final class JWTErrorCode {
+    public static final class JWTErrorCode{
         //jwt验证错误类型
-        public static String JWT_ERRCODE_EXPIRE = "402";    //token过期
-        public static String JWT_ERRCODE_FAIL = "403";        //验证失败
+        public static String  JWT_ERRCODE_EXPIRE= "402"; 	//token过期
+        public static String  JWT_ERRCODE_FAIL= "403"; 		//验证失败
     }
 
-    public static final int EXPRIATION = 1000 * 60 * 60 * 24 * 7;
+    public static final int EXPRIATION = 1000*60*60*24*7;
 
     /**
      * 发布状态

src/main/java/platform/modules/api/web/SkyImageApiController.java

@@ -1,15 +1,13 @@
 package platform.modules.api.web;
 
-import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.*;
-import platform.modules.api.dto.SkyImageCount;
+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 platform.modules.api.dto.Sync;
 import platform.modules.api.service.SkyImageApiService;
-import platform.modules.api.service.SkyImageCountApiService;
-import platform.modules.carrier.dto.CarrierLibraryResult;
-import platform.modules.carrier.entity.Building;
 import platform.modules.government.entity.User;
 import platform.modules.sys.web.ResponseMessage;
 
@@ -26,9 +24,6 @@ public class SkyImageApiController {
     @Autowired
     private SkyImageApiService skyImageApiService;
 
-    @Autowired
-    private SkyImageCountApiService skyImageCountApiService;
-
     @PostMapping("syncUserInfo")
     public ResponseMessage syncSkyImageUserInfo(@RequestBody List<Sync> syncs){
         if (!ObjectUtils.isEmpty(syncs)){
@@ -39,27 +34,4 @@ public class SkyImageApiController {
         }
         return ResponseMessage.success("success");
     }
-
-    @GetMapping("/factoryBuilding")
-    public ResponseMessage factoryBuilding(){
-        List<SkyImageCount> counts = skyImageCountApiService.factoryBuilding();
-        return ResponseMessage.success("success", counts);
-    }
-
-    @GetMapping("parkCount")
-    public ResponseMessage parkCount(){
-        return ResponseMessage.success("success", skyImageCountApiService.getParkStatistic());
-    }
-
-    @GetMapping("streetCount")
-    public ResponseMessage streetCount(){
-        return ResponseMessage.success("success", skyImageCountApiService.getStreetStatistic());
-    }
-
-    @GetMapping("leaseBuilding")
-    public ResponseMessage leaseBuilding(String startTime, String endTime){
-
-        return ResponseMessage.success("success", skyImageCountApiService.leaseBuilding(startTime, endTime));
-    }
-
 }

src/main/java/platform/modules/build/service/CompanyService.java

@@ -5,8 +5,6 @@ import com.aliyuncs.exceptions.ClientException;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -62,8 +60,6 @@ import java.util.Objects;
 @Transactional(readOnly = true)
 public class CompanyService extends BaseService<Company> {
 
-    private static Logger logger = LoggerFactory.getLogger(CompanyService.class);
-
     @Autowired
     private CompanyDao companyDao;
 
@@ -483,9 +479,7 @@ public class CompanyService extends BaseService<Company> {
             approval1.setOper_type(Constant.OperType.APPROVED);
             //保存审核记录
             approvalService.insertAndGetId(approval1);
-            if (CommonUtils.isNotNull(users) && users.size() > 0 ) {
-                sendSMSToRegisteredCompanyUser(users.get(0), true, approval1);
-            }
+            sendSMSToRegisteredCompanyUser(users.get(0), true, approval1);
 
         } else {//退回
             //查询最近的一条审核记录
@@ -520,9 +514,7 @@ public class CompanyService extends BaseService<Company> {
             user.setIs_register(2);
             user.setDel_flag(true);
             userService.updateSelective(user);
-            if (CommonUtils.isNotNull(user) && users.size() > 0) {
-                sendSMSToRegisteredCompanyUser(users.get(0), false, approval1);
-            }
+            sendSMSToRegisteredCompanyUser(users.get(0), false, approval1);
 
             //同步信息给天启
 //            SyncUserDto dto = new SyncUserDto();
@@ -549,42 +541,27 @@ public class CompanyService extends BaseService<Company> {
     }
 
     //发送短信给企业用户，账号注册成功/失败
-    // 发送短信 错误修改  wangjiang 2020-1-8
-    private void sendSMSToRegisteredCompanyUser(User user, Boolean isPassed, Approval approval)  {
-        String templateParam;
-        String phone = user.getPhone();
-        logger.info("send msg to register company user which phone is : {}", phone);
+    private void sendSMSToRegisteredCompanyUser(User user, Boolean isPassed, Approval approval) throws ClientException, InterruptedException {
         if (isPassed) {
             //发送短信给企业用户，账号注册成功
             //您的企业${company_name}账号注册，审核通过啦! 账号名为${nick_name}。感谢您的支持。
-//            String phone = user.getPhone();
+            String phone = user.getPhone();
             String nick_name = user.getNick_name();
             String company_name = user.getCompany_name();
-            templateParam = "{\"nick_name\":\"" + nick_name + "\",\"company_name\":\"" + company_name + "\"}";
-//            AlibabaSMSUtil.sendSMS(phone, Constant.SMS_TemplateCode.COMPANY_USER_REGISTER_PASSED, "企业提升发展服务平台", templateParam);
+            String templateParam = "{\"nick_name\":\"" + nick_name + "\",\"company_name\":\"" + company_name + "\"}";
+            AlibabaSMSUtil.sendSMS(phone, Constant.SMS_TemplateCode.COMPANY_USER_REGISTER_PASSED, "企业提升发展服务平台", templateParam);
         } else {
             //发送短信给企业用户，账号注册失败
             //您的企业${company_name}账号注册(账号名为${nick_name})，审核失败。${comment}感谢您的支持。
-//            String phone = user.getPhone();
+            String phone = user.getPhone();
             String nick_name = user.getNick_name();
             String company_name = user.getCompany_name();
             String comment = approval.getApproval_comment();
             if (null != comment && comment.length() > 20) {
                 comment = comment.substring(0, 20);
             }
-            templateParam = "{\"nick_name\":\"" + nick_name + "\",\"comment\":\"" + comment + "\",\"company_name\":\"" + company_name + "\"}";
-        }
-
-        try {
+            String templateParam = "{\"nick_name\":\"" + nick_name + "\",\"comment\":\"" + comment + "\",\"company_name\":\"" + company_name + "\"}";
             AlibabaSMSUtil.sendSMS(phone, Constant.SMS_TemplateCode.COMPANY_USER_REGISTER_REJECT, "企业提升发展服务平台", templateParam);
-        } catch (ClientException e) {
-            logger.error("发送阿里巴巴sms错误(ClientException)：{}", e.getMessage());
-            e.printStackTrace();
-            throw new RuntimeException("发送阿里巴巴sms错误(ClientException)：" + e.getMessage());
-        } catch (InterruptedException e) {
-            logger.error("发送阿里巴巴sms错误(InterruptedException)：{}", e.getMessage());
-            e.printStackTrace();
-            throw new RuntimeException("发送阿里巴巴sms错误(InterruptedException)：" + e.getMessage());
         }
     }
 

src/main/java/platform/modules/carrier/dao/BuildingDao.java

@@ -3,7 +3,6 @@ package platform.modules.carrier.dao;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 import platform.common.base.mapper.BaseMapper;
-import platform.modules.api.dto.SkyImageCount;
 import platform.modules.carrier.dto.*;
 import platform.modules.carrier.entity.Building;
 import platform.modules.carrier.entity.CarrierDistribution;
@@ -49,8 +48,4 @@ public interface BuildingDao extends BaseMapper<Building> {
     Double findCarrierEntryArea(@Param("startTime") String startTime, @Param("endTime") String endTime);
 
     List<CarrierDistribution> getStreetBuildingDistribution(@Param("condition") SearchCondition condition);
-
-    List<SkyImageCount> factoryBuildingCount();
-
-    List<SkyImageCount> findEndContractByTime(@Param("startTime") String startTime, @Param("endTime") String endTime);
 }

src/main/java/platform/modules/carrier/dao/ContractFloorDao.java

@@ -27,6 +27,4 @@ public interface ContractFloorDao extends BaseMapper<ContractFloor> {
     Integer findCarrierVolume(@Param("startTime") String startTime, @Param("endTime") String endTime);
 
     List<CarrierVolume> findEachParkVolume(@Param("startTime") String startTime, @Param("endTime") String endTime);
-
-    List<ContractFloor> findEndContractByTime(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("id") Integer id);
 }

src/main/java/platform/modules/carrier/service/BuildingService.java

@@ -16,7 +16,6 @@ import platform.common.base.model.Dict;
 import platform.common.base.model.DictionaryItem;
 import platform.common.base.service.BaseService;
 import platform.common.base.service.DictionaryItemService;
-import platform.modules.api.dto.SkyImageCount;
 import platform.modules.build.entity.BuildFloor;
 import platform.modules.build.entity.BuildInfo;
 import platform.modules.build.service.ContractService;
@@ -887,31 +886,4 @@ public class BuildingService extends BaseService<Building> {
     public List<CarrierDistribution> getStreetBuildingDistribution(SearchCondition condition) {
         return buildingDao.getStreetBuildingDistribution(condition);
     }
-
-
-    /**
-     * 获取厂房面积统计
-     *
-     * @return
-     */
-    public List<SkyImageCount> factoryBuildingCount() {
-        List<SkyImageCount> list =  buildingDao.factoryBuildingCount();
-        for (SkyImageCount skyImageCount : list) {
-            if (skyImageCount.getBuildingArea() <= 0){
-                //按楼层建筑面积和算
-            }
-        }
-        return list;
-    }
-
-    /**
-     * 相应时间内合同到期的企业
-     *
-     * @param startTime
-     * @param endTime
-     * @return
-     */
-    public List<SkyImageCount> findEndContractByTime(String startTime, String endTime) {
-        return buildingDao.findEndContractByTime(startTime, endTime);
-    }
 }

src/main/java/platform/modules/carrier/service/CarrierStatisticService.java

@@ -114,7 +114,7 @@ public class CarrierStatisticService {
      * @param id
      * @return
      */
-    public Double getSumStreetBuildingArea(Integer id) {
+    private Double getSumStreetBuildingArea(Integer id) {
         Double sumBuildArea = buildingService.findStreetTotalArea(id);
 //        List<Building> buildings = buildingService.findBySteetId(id);
 //        for (Building building : buildings) {

src/main/java/platform/modules/carrier/service/ContractFloorService.java

@@ -110,15 +110,4 @@ public class ContractFloorService extends BaseService<ContractFloor> {
     public List<CarrierVolume> findEachParkVolume(String startTime, String endTime) {
         return contractFloorDao.findEachParkVolume(startTime, endTime);
     }
-
-    /**
-     * 查找相应时间内到期的合同
-     *
-     * @param startTime
-     * @param endTime
-     * @return
-     */
-    public List<ContractFloor> findEndContractByTime(String startTime, String endTime, Integer id) {
-        return contractFloorDao.findEndContractByTime(startTime, endTime, id);
-    }
 }

src/main/java/platform/modules/carrier/service/ParkService.java

@@ -563,20 +563,6 @@ public class ParkService extends BaseService<Park> {
         return parks;
     }
 
-    @Transactional(readOnly = true)
-    public List<Park> findParkOnUseList() {
-        Example example = new Example(Park.class);
-        Example.Criteria criteria = example.createCriteria();
-        criteria.andEqualTo("del_flag", 0);
-        criteria.andEqualTo("is_start", 1);
-        criteria.andEqualTo("is_draft", 1);
-        //倒序
-        //example.orderBy("create_time").desc();
-        example.setOrderByClause("id");
-        List<Park> parks = this.selectByExample(example);
-        return parks;
-    }
-
     public int updateNoBatch(List<Park> parks) {
         return parkDao.updateNoBatch(parks);
     }

src/main/java/platform/modules/carrier/web/api/WeChatApiController.java

@@ -162,7 +162,7 @@ public class WeChatApiController extends BaseController {
     public Object getStreetAreaStatistic(
             @RequestParam(defaultValue = "1", required = false) Integer pageNum,
             @RequestParam(defaultValue = "10", required = false) Integer pageSize
-    ) {
+    ){
         PageInfo<CarrierLibraryResult> pageInfo = contractService.getStreetAreaStatistic(pageNum, pageSize);
         return ResponseMessage.success("success", pageInfo);
     }
@@ -180,12 +180,12 @@ public class WeChatApiController extends BaseController {
     }
 
     /**
-     * 获取所有街道
+     *  获取所有街道
      *
      * @return
      */
     @GetMapping("/streets")
-    public Object getStreetList() {
+    public Object getStreetList(){
         Street street = new Street();
         street.setIs_start(true);
         List<Street> streets = streetService.findListByWhere(street);
@@ -198,7 +198,7 @@ public class WeChatApiController extends BaseController {
      * @return
      */
     @GetMapping("/parkNames")
-    public Object findParkNames(SearchCondition condition) {
+    public Object findParkNames(SearchCondition condition){
         PageInfo<Park> pageInfo = parkService.findParkNames(condition);
         return ResponseMessage.success("success", pageInfo);
     }
@@ -233,7 +233,7 @@ public class WeChatApiController extends BaseController {
      * @return
      */
     @GetMapping("/front/parkDetail/{id}")
-    public Object frontParkDetail(@PathVariable Integer id) {
+    public Object frontParkDetail(@PathVariable Integer id){
         Park park = parkService.frontParkDetailById(id);
         park.setFile_down_url(setFileUrl());
         return ResponseMessage.success("success", park);
@@ -259,7 +259,7 @@ public class WeChatApiController extends BaseController {
      * @return
      */
     @GetMapping("/firstContact/{id}")
-    public Object firstCompanyContact(@PathVariable Integer id) {
+    public Object firstCompanyContact(@PathVariable Integer id){
         User firstContact = userService.findFirstContact(id);
         return ResponseMessage.success("success", firstContact);
     }
@@ -271,22 +271,22 @@ public class WeChatApiController extends BaseController {
      * @return
      */
     @GetMapping("/personalCenter/{id}")
-    public Object personalCenter(@PathVariable Integer id) {
+    public Object personalCenter(@PathVariable Integer id){
         User user = userService.findById(id);
 
         if (user.getUser_type().equals(Constant.UserType.GOVERNMENT)) {
             user.setDepartment_name(userService.getGovDepartment(user));
         }
 
-        if (user.getUser_type().equals(Constant.UserType.COMPANY)) {
+        if (user.getUser_type().equals(Constant.UserType.COMPANY)){
             user.setDepartment_name(userService.getCompanyDepartment(user));
         }
 
-        if (user.getUser_type().equals(Constant.UserType.STREET)) {
+        if (user.getUser_type().equals(Constant.UserType.STREET)){
             user.setDepartment_name(userService.getStreetDepartment(user));
         }
 
-        if (user.getUser_type().equals(Constant.UserType.BUILD)) {
+        if (user.getUser_type().equals(Constant.UserType.BUILD)){
             user.setDepartment_name(userService.getBuildDepartment(user));
         }
         return ResponseMessage.success("success", user);
@@ -300,7 +300,7 @@ public class WeChatApiController extends BaseController {
      */
     @OperationLog(value = "修改密码")
     @PostMapping("/changePass")
-    public Object changePass(@RequestBody ChangePassword changePassword) {
+    public Object changePass(@RequestBody ChangePassword changePassword){
         return userService.changePassword(changePassword);
     }
 
@@ -360,7 +360,7 @@ public class WeChatApiController extends BaseController {
      * @return
      */
     @GetMapping("/companyContactList")
-    public Object companyContact(String letter, String companyName) {
+    public Object companyContact(String letter, String companyName){
 
         List<CompanyContacts> companyContacts = companyService.findCompanyListByName(letter, companyName);
 
@@ -374,7 +374,7 @@ public class WeChatApiController extends BaseController {
     }
 
     /**
-     * 载体库楼栋列表
+     *载体库楼栋列表
      *
      * @return
      */
@@ -382,26 +382,26 @@ public class WeChatApiController extends BaseController {
     public Object getBuildingStatistic(
             @RequestParam(defaultValue = "1", required = false) Integer pageNum,
             @RequestParam(defaultValue = "10", required = false) Integer pageSize,
-            SearchCondition condition) {
+            SearchCondition condition){
         Map<String, Object> map = carrierStatisticService.getWechatBuildingStatistic(pageNum, pageSize, condition);
-        return ResponseMessage.success("success", map);
+        return  ResponseMessage.success("success", map);
     }
 
     /**
-     * 载体库各街道列表
+     *载体库各街道列表
      *
      * @return
      */
     @GetMapping("/streetStatistic")
-    public Object getStreetStatistic(
+    public Object getStreetStatistic (
             @RequestParam(defaultValue = "1", required = false) Integer pageNum,
-            @RequestParam(defaultValue = "10", required = false) Integer pageSize) {
+            @RequestParam(defaultValue = "10", required = false) Integer pageSize){
         Map<String, Object> map = carrierStatisticService.getWechatStreetStatistic(pageNum, pageSize);
-        return ResponseMessage.success("success", map);
+        return  ResponseMessage.success("success", map);
     }
 
     /**
-     * 载体各库园区列表
+     *载体各库园区列表
      *
      * @return
      */
@@ -409,9 +409,9 @@ public class WeChatApiController extends BaseController {
     public Object getParkStatistic(
             @RequestParam(defaultValue = "1", required = false) Integer pageNum,
             @RequestParam(defaultValue = "10", required = false) Integer pageSize,
-            @PathVariable Integer id) {
+            @PathVariable Integer id){
         Map<String, Object> map = carrierStatisticService.getWechatParkStatistic(pageNum, pageSize, id);
-        return ResponseMessage.success("success", map);
+        return  ResponseMessage.success("success", map);
     }
 
     @OperationLog(value = "查看我的消息列表")
@@ -476,7 +476,7 @@ public class WeChatApiController extends BaseController {
      * @return
      */
     @GetMapping("activityStatistic/{userId}")
-    public Object activityStatistic(@PathVariable Integer userId) {
+    public Object activityStatistic(@PathVariable Integer userId){
 
         ActivityStatistic statistic = activityRegistrationService.findActivityStatistic(userId);
 
@@ -489,7 +489,7 @@ public class WeChatApiController extends BaseController {
      * @return
      */
     @GetMapping("findTypesActivitys/{userId}")
-    public Object findTypesActivitys(@PathVariable Integer userId, String type) {
+    public Object findTypesActivitys(@PathVariable Integer userId, String type){
 
         List<ActivityDetail> activitys = activityRegistrationService.findTypesActivitys(type, userId);
         for (ActivityDetail activity : activitys) {
@@ -502,7 +502,7 @@ public class WeChatApiController extends BaseController {
         }
         Map<String, Object> map = new HashMap<>();
         map.put("file_url", setFileUrl());
-        map.put("activitys", activitys);
+        map .put("activitys", activitys);
         return ResponseMessage.success("success", map);
     }
 
@@ -519,27 +519,27 @@ public class WeChatApiController extends BaseController {
     }
 
     /**
-     * 取消报名
+     *  取消报名
      *
      * @param ids
      * @return
      */
     @PostMapping("/abort")
-    public Object quert(@RequestBody List<String> ids) {
+    public Object quert(@RequestBody List<String> ids){
 //        List<String> idList = Arrays.asList(ids);
         activityRegistrationService.adortRegister(ids);
         return ResponseMessage.success("取消成功");
     }
 
     /**
-     * 强烈推荐
+     *  强烈推荐
      *
      * @return
      */
     @GetMapping("/highlyRecommended")
     public Object highlyRecommended(
             @RequestParam(defaultValue = "1") Integer pageNum,
-            @RequestParam(defaultValue = "10") Integer pageSize) {
+            @RequestParam(defaultValue = "10") Integer pageSize){
         Map<String, Object> map = new HashMap<>();
         map.put("file_url", setFileUrl());
         map.put("data", activityService.findHighlyRecommended(pageNum, pageSize));

src/main/java/platform/modules/government/web/ActivityFeedbackController.java

@@ -7,7 +7,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
-import platform.common.annotation.OperationLog;
 import platform.common.base.controller.BaseController;
 import platform.common.base.service.DictionaryItemService;
 import platform.common.util.DateUtil;
@@ -47,7 +46,7 @@ public class ActivityFeedbackController extends BaseController {
      * @return
      */
     @GetMapping("index")
-    public Object index(FeedbackQuery query, ModelMap modelMap) {
+    public Object index(FeedbackQuery query, ModelMap modelMap){
         PageInfo<ActivityFeedback> pageInfo = activityFeedbackService.findFeedbackList(query);
         modelMap.put("pageInfo", pageInfo);
         modelMap.put("query", query);
@@ -55,12 +54,13 @@ public class ActivityFeedbackController extends BaseController {
     }
 
     /**
+     *
      * @param query
      * @return
      */
     @GetMapping("/list")
     @ResponseBody
-    public Object getFeedbackList(FeedbackQuery query) {
+    public Object getFeedbackList(FeedbackQuery query){
         PageInfo<ActivityFeedback> pageInfo = activityFeedbackService.findFeedbackList(query);
         return ResponseMessage.success("success", pageInfo);
     }
@@ -73,7 +73,7 @@ public class ActivityFeedbackController extends BaseController {
      */
     @GetMapping("/feedbackCount")
     @ResponseBody
-    public Object getFeedbackTypeCount(FeedbackQuery query) {
+    public Object getFeedbackTypeCount(FeedbackQuery query){
         ActivityFeedback feedback = activityFeedbackService.findCountByFeedbackType(query);
         return ResponseMessage.success("success", feedback);
     }
@@ -86,7 +86,7 @@ public class ActivityFeedbackController extends BaseController {
      */
     @GetMapping("/home")
     @ResponseBody
-    public Object homeIndex(FeedbackQuery query) {
+    public Object homeIndex(FeedbackQuery query){
         PageInfo<ActivityFeedback> pageInfo = activityFeedbackService.findFeedbackList(query);
         return ResponseMessage.success("sucdess", pageInfo);
     }
@@ -99,7 +99,7 @@ public class ActivityFeedbackController extends BaseController {
      */
     @PostMapping("/save")
     @ResponseBody
-    public Object save(@RequestBody ActivityFeedback feedback) {
+    public Object save(@RequestBody ActivityFeedback feedback){
         feedback.setFeedback_time(new Date());
         feedback.setApproval_status(0);
         activityFeedbackService.insertAndGetId(feedback);
@@ -114,13 +114,14 @@ public class ActivityFeedbackController extends BaseController {
      */
     @PostMapping("/isView")
     @ResponseBody
-    public Object isView(Integer id, Boolean is_view) {
+    public Object isView(Integer id, Boolean is_view){
         ActivityFeedback feedback = activityFeedbackService.findById(id);
-        if (feedback != null) {
+        if (feedback != null){
             feedback.setIs_view(is_view);
-            if (is_view) {
+            if (is_view){
                 feedback.setApproval_status(1);
-            } else {
+            }
+            else {
                 feedback.setApproval_status(2);
             }
             activityFeedbackService.updateSelective(feedback);
@@ -135,23 +136,8 @@ public class ActivityFeedbackController extends BaseController {
      * @return
      */
     @GetMapping("/re_review/{id}")
-    public Object re_review(@PathVariable Integer id, ModelMap modelMap) {
+    public Object re_review(@PathVariable Integer id, ModelMap modelMap){
         modelMap.put("feedback_id", id);
         return BASE_GOVERNMENT_PATH + "activity_feedback/approval";
     }
-
-//    @OperationLog(value = "根据活动id获取所有反馈评论信息")
-//    @GetMapping(value = "/feedback/page")
-//    public Object feedbackPage(@RequestParam("activity_id") String activity_id, Integer pageNum, Integer pageSize, ModelMap modelMap) {
-//        PageInfo<ActivityFeedback> pageInfo = activityFeedbackService.feedbackPage(activity_id, pageNum, pageSize);
-//        modelMap.put("pageInfo", pageInfo);
-//        return BASE_GOVERNMENT_PATH + "activity_feedback/list";
-//    }
-
-    @OperationLog(value = "根据活动id修改反馈评论信息")
-    @PutMapping(value = "/feedback")
-    @ResponseBody
-    public Object feedbackPut(ActivityFeedback activityFeedback) {
-        return ResponseMessage.success("操作成功!", activityFeedbackService.feedbackUpdate(activityFeedback));
-    }
 }

src/main/java/platform/modules/home/HomeController.java

@@ -46,7 +46,6 @@ import platform.modules.home.request.FindRequest;
 import platform.modules.home.response.FindResponse;
 import platform.modules.home.response.FindResponseProject;
 import platform.modules.home.response.ListResponse;
-import platform.modules.home.service.WxMicroappService;
 import platform.modules.sys.entity.ActivityDetail;
 import platform.modules.sys.entity.ActivityFavourite;
 import platform.modules.sys.entity.ActivityRegistration;
@@ -182,9 +181,6 @@ public class HomeController extends BaseController {
     @Autowired
     private BuildingService buildingService;
 
-    @Autowired
-    private WxMicroappService wxMicroappService;
-
 //    @GetMapping(value = "")
 //    public String homePage(ModelMap modelMap) throws Exception {
 //        //获取幻灯片
@@ -874,7 +870,7 @@ public class HomeController extends BaseController {
         modelMap.put("isLogin", ShiroUtils.isLogin());
         modelMap.put("userType", ShiroUtils.getUserType());
         modelMap.put("userName", ShiroUtils.getNickName());
-        modelMap.put("userId", ShiroUtils.getUserId());
+        modelMap.put("userId",ShiroUtils.getUserId());
         User user = ShiroUtils.getUserEntity();
         if (user != null) {
             modelMap.put("firstLogin", user.getFist_login());
@@ -1015,7 +1011,7 @@ public class HomeController extends BaseController {
      */
     @RequestMapping("/personalRegister")
     @ResponseBody
-    public ResponseMessage personalRegister(User userInfo) {
+    public ResponseMessage personalRegister(User userInfo){
         try {
             if (!Constant.Environment.PROD_TEST.equals(profiles) && !Constant.Environment.TEST.equals(profiles)) {
                 if (!verificationCodeUtil.validateVerificationCode(userInfo.getPhone(), userInfo.getValidateNum())) {
@@ -1043,66 +1039,6 @@ public class HomeController extends BaseController {
         return ResponseMessage.success("注册成功");
     }
 
-    @GetMapping("/validate")
-    @ResponseBody
-    public ResponseMessage wechatRegist(@RequestParam("phone") String phone, @RequestParam("code") String code) {
-        return ResponseMessage.success("请求成功", verificationCodeUtil.validateVerificationCode(phone, code));
-    }
-
-    /**
-     * 微信注册
-     *
-     * @param userInfo
-     * @return
-     */
-    @PostMapping("/wechatRegist")
-    @ResponseBody
-    public ResponseMessage wechatRegist(@RequestBody User userInfo) {
-
-        User user_o = userService.findByMobile(userInfo.getPhone());
-        if (user_o != null) {
-            return ResponseMessage.success("注册成功", user_o.getId());
-        }
-        User user = new User();
-        user.setUser_name(userInfo.getPhone());
-        user.setNick_name(userInfo.getPhone());
-        user.setPassword(SecureUtil.md5().digestHex("123456".trim()));
-        user.setPhone(userInfo.getPhone());
-        user.setUser_type(Constant.UserType.WECHAT);
-        user.setIs_register(1);
-        user.setFist_login(1);
-        user.setIs_start(true);
-        user.setIs_admin(false);
-        user.setCreate_name("wechat_" + userInfo.getPhone());
-        user.setCreate_time(DateUtil.getTimeString(new Date()));
-        Integer id = userService.insertAndGetId(user);
-        return ResponseMessage.success("注册成功", id);
-    }
-
-    /**
-     * 微信小程序登录
-     */
-    @GetMapping("/wxapp/login")
-    @ResponseBody
-    public ResponseMessage wxAppLogin(
-            @RequestParam String code
-    ) {
-        return ResponseMessage.success("登录成功", wxMicroappService.wxAppLogin(code));
-    }
-
-    /**
-     * 微信小程序获取用户信息
-     */
-    @GetMapping("/wxapp/phone")
-    @ResponseBody
-    public ResponseMessage wxAppUserinfo(
-            @RequestParam String code,
-            @RequestParam String encryptedData,
-            @RequestParam String iv
-    ) {
-        return ResponseMessage.success("获取用户信息成功", wxMicroappService.getPhoneNumber(code, encryptedData, iv));
-    }
-
     /**
      * 企业注册
      *
@@ -1116,7 +1052,7 @@ public class HomeController extends BaseController {
     public ResponseMessage register(Company information, User userInfo) throws Exception {
         try {
             Approval approval = new Approval();
-            if (!Constant.Environment.PROD_TEST.equals(profiles) && !Constant.Environment.TEST.equals(profiles)) {
+            if (!Constant.Environment.PROD_TEST.equals(profiles) && !Constant.Environment.TEST.equals(profiles)){
                 if (!verificationCodeUtil.validateVerificationCode(information.getPhone(), information.getValidateNum())) {
                     return ResponseMessage.error("验证码错误！");
                 }
@@ -1137,11 +1073,12 @@ public class HomeController extends BaseController {
             //查看是否已经存在企业
 //            Company company = companyService.findByParkIdAndCompanyName(information.getCompany_name(), information.getBuild_id());
             Company company = companyService.findByCompanyName(information.getCompany_name());
-            if (company != null) {
+            if (company != null){
                 information.setId(company.getId());
                 information.setIs_register(0);
                 companyService.update(information);
-            } else {
+            }
+            else {
                 companyService.insertAndGetId(information);
             }
             approval.setApply_id(information.getId());

src/main/java/platform/modules/home/service/HomeRefactorService.java

@@ -3,7 +3,6 @@ package platform.modules.home.service;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import io.swagger.models.auth.In;
-import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,12 +23,9 @@ import platform.modules.sys.entity.ActivityReview;
 import platform.modules.sys.service.*;
 import platform.modules.sys.web.ResponseMessage;
 
-import java.io.IOException;
-import java.io.InputStream;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
-import java.util.Base64;
 import java.util.List;
 
 /**
@@ -140,10 +136,10 @@ public class HomeRefactorService {
      * @return
      */
     public ResponseMessage findProjectDetail(Integer id, Integer isFilling) {
-        if (isFilling == 0) {
+        if (isFilling == 0){
             //项目申报
             ProjectDeclaration project = projectDeclarationService.selectById(String.valueOf(id));
-            if (project != null) {
+            if (project != null){
                 String sourceName = dictionaryItemService.findNameByTypeAndValue(Constant.DictionaryType.PROJECT_SOURCE, project.getProject_source());
                 project.setProject_source_name(sourceName);
                 project.setProject_content(StringEscapeUtils.unescapeHtml4(project.getProject_content()));
@@ -164,7 +160,7 @@ public class HomeRefactorService {
                 projectDeclarationService.updateSelective(project);
             }
             return ResponseMessage.success("success", project);
-        } else if (isFilling == 1) {
+        } else if (isFilling == 1){
             ProjectProvincesDeclaration provinces = projectProvincesDeclarationService.selectById(String.valueOf(id));
             if (null != provinces) {
                 String sourceName = dictionaryItemService.findNameByTypeAndValue(Constant.DictionaryType.PROJECT_SOURCE, provinces.getProject_source());
@@ -228,35 +224,27 @@ public class HomeRefactorService {
             // 综合星级
             activity.setAvg_star(activityFeedbackService.findAvgStar(id));
             //是否收藏
-            if (isFavourited(id, user_id)) {
+            if (isFavourited(id, user_id)){
                 activity.setIs_favourited("1");
-            } else {
+            }
+            else {
                 activity.setIs_favourited("0");
             }
             //浏览数+1
             activity.setReading_number(activity.getReading_number() + 1);
             activityService.updateSelective(activity);
         }
-        InputStream is_detail = activityService.getQRcode("1", "350", "activity_id=" + id);
-        try {
-            byte[] bytes_detail = IOUtils.toByteArray(is_detail);
-            String encoded_detail = Base64.getEncoder().encodeToString(bytes_detail);
-            activity.setQr_code("data:image/jpg;base64," + encoded_detail);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
         return activity;
     }
 
     /**
      * 活动是否收藏
-     *
      * @param id
      * @return
      */
-    public boolean isFavourited(Integer id, Integer user_id) {
+    public boolean isFavourited(Integer id, Integer user_id){
         ActivityFavourite activityFavourite = activityFavouriteService.selectByActivityIdAndUserId(id + "", user_id + "");
-        if (activityFavourite != null) {
+        if (activityFavourite != null){
             return true;
         }
         return false;

src/main/java/platform/modules/sys/dao/ActivityFeedbackDao.java

@@ -22,8 +22,4 @@ public interface ActivityFeedbackDao extends BaseMapper<ActivityFeedback> {
     Double findAvgStar(Integer activity_id);
 
     List<ActivityFeedback> findUserFeedback(@Param("id") Integer id, @Param("userId") int userId);
-
-    List<ActivityFeedback> feedbackList(@Param("activity_id") String activityId, @Param("is_public") String isPublic, @Param("is_view") String isview, @Param("minScore") String minScore, @Param("maxScore") String maxScore);
-
-    List<ActivityFeedback> feedbackPage(@Param("activity_id") String activityId, @Param("minScore") String minScore, @Param("maxScore") String maxScore);
 }

src/main/java/platform/modules/sys/dao/ActivityRegistrationDao.java

@@ -6,7 +6,6 @@ import platform.modules.carrier.dto.ActivityStatistic;
 import platform.modules.sys.entity.ActivityDetail;
 import platform.modules.sys.entity.ActivityRegistration;
 import platform.modules.sys.report.ActivityRegistrationExports;
-import platform.modules.sys.report.ActivitySignExports;
 
 import java.util.List;
 
@@ -27,15 +26,11 @@ public interface ActivityRegistrationDao extends BaseMapper<ActivityRegistration
 
     List<ActivityRegistration> findByRelationIdAndType(@Param("type") String type, @Param("rel") String id, @Param("activity_id") String activity_id);
 
-    List<ActivityRegistration> findByActivityUserIdPhone(@Param("activity_id") String activity_id, @Param("phone") String phone, @Param("user_id") String user_id);
-
-    List<ActivityRegistration> findByActivityIdAndUserIdAndPhones(@Param("activity_id") String activity_id, @Param("user_id") String user_id, @Param("registrations") List<ActivityRegistration> registrations);
-
     List<ActivityRegistrationExports> findRegistrationExport(@Param("activityId") Integer activityId, @Param("userId") Integer userId);
 
     void adortRegister(@Param("list") List<String> ids);
 
-    List<ActivityRegistration> getActivityRegistration(@Param("activityId") String activityId, @Param("userId") String userId);
+    List<ActivityRegistration> getActivityRegistration(@Param("activityId") Integer activityId, @Param("userId") int userId);
 
     List<ActivityDetail> findPendingActivity(Integer userId);
 

src/main/java/platform/modules/sys/entity/ActivityDetail.java

@@ -21,8 +21,6 @@ public class ActivityDetail extends BaseEntity {
 
     private String activity_location;
 
-    private String lat_lng;
-
     private String activity_starttime;
 
     private String activity_endtime;
@@ -58,9 +56,6 @@ public class ActivityDetail extends BaseEntity {
     @Transient
     private int registration_number;
 
-    @Transient
-    private int registration_pass_number;
-
     @Transient
     private int registration_success_number;
 
@@ -152,6 +147,5 @@ public class ActivityDetail extends BaseEntity {
     private String activity_type_status;
     @Transient
     List<Integer> regUsers;
-    @Transient
-    private String qr_code;
+
 }

src/main/java/platform/modules/sys/entity/ActivityFeedback.java

@@ -12,69 +12,29 @@ import java.util.List;
 @Table(name = "ac_activity_feedback")
 public class ActivityFeedback extends BaseEntity {
 
-    //活动id
-    private String activity_id;
+    private Integer activity_id;
 
-    //用户id
-    private String user_id;
+    private Integer user_id;
 
-    //微信头像
-    private String weixin_head_url;
-
-    //微信昵称
-    private String feedback_name;
-
-    //用户类型(0政府，1园区，2超级管理员,3企业,4街道,5个人,6微信)
     private String user_type;
 
-    //评分 1:一星、2：二星、3:三星、4:四星、5:五星、0：无星
-    private Integer feedback_type;
+    private Integer feedback_type;          //反馈类型1:一星、2：二星、3:三星、4:四星、5:五星、0：无星
 
-    //反馈内容
     private String content;
 
-    //反馈时间
     private Date feedback_time;
 
-    //回复
-    private String reply;
-
-    //回复人id
-    private String reply_id;
-
-    //内容设计星级 共五星 一星4分
-    private Integer score_1;
-
-    //讲师水平星级 共五星 一星4分
-    private Integer score_2;
-
-    //活动效果星级 共五星 一星12分
-    private Integer score_3;
-
-    //综合评分
-    private Integer score;
-
-    //是否公开
-    private Boolean is_public;
-
-    //是否门户显示
     private Boolean is_view;
 
-    //是否置顶
-    private Boolean is_top;
-
-    //0：未审核、1:已审核    废弃字段
     private Integer approval_status;
 
+    private Boolean is_no_name;
+
     @Transient
     private String activity_title;
-
     @Transient
     private Integer feedback_count;
-
     @Transient
     private String feedback_type_str;
 
-    @Transient
-    private String reply_name;
 }

src/main/java/platform/modules/sys/service/ActivityFeedbackService.java

@@ -13,7 +13,7 @@ import platform.modules.sys.dao.ActivityFeedbackDao;
 import platform.modules.sys.entity.ActivityFeedback;
 
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.List;
 
 @Service
 @Transactional
@@ -25,7 +25,7 @@ public class ActivityFeedbackService extends BaseService<ActivityFeedback> {
     public Integer saveActivityFeedback(ActivityFeedback activityFeedback) {
 
         User currUser = ShiroUtils.getUserEntity();
-        activityFeedback.setUser_id(currUser.getId() + "");
+        activityFeedback.setUser_id(currUser.getId());
         activityFeedback.setUser_type(currUser.getUser_type().toString());
         return this.saveSelective(activityFeedback);
     }
@@ -70,7 +70,7 @@ public class ActivityFeedbackService extends BaseService<ActivityFeedback> {
     }
 
     /**
-     * 获取反馈类型数
+     *  获取反馈类型数
      *
      * @param query
      * @return
@@ -100,135 +100,9 @@ public class ActivityFeedbackService extends BaseService<ActivityFeedback> {
      */
     public ActivityFeedback findUserFeedback(Integer id, int userId) {
         List<ActivityFeedback> feedbacks = activityFeedbackDao.findUserFeedback(id, userId);
-        if (feedbacks.size() > 0) {
+        if (feedbacks.size() > 0){
             return feedbacks.get(0);
         }
         return new ActivityFeedback();
     }
-
-    /**
-     * @Author: huZhiHao
-     * @Description: 获取列表
-     * @Date: 2020/1/7
-     * @Params: [activityId, userId, isPublic, isView]
-     * @Return: java.util.List<platform.modules.sys.entity.ActivityFeedback>
-     **/
-    @Transactional(readOnly = true)
-    public List<ActivityFeedback> feedbackList(String activityId, String isPublic, String isView, String minScore, String maxScore) {
-
-        List<ActivityFeedback> feedbacks = activityFeedbackDao.feedbackList(activityId, isPublic, isView, minScore, maxScore);
-        return feedbacks;
-    }
-
-    /**
-     * @Author: huZhiHao
-     * @Description: 保存
-     * @Date: 2020/1/7
-     * @Params: [activityFeedback]
-     * @Return: java.lang.Integer
-     **/
-    public Integer feedbackSave(ActivityFeedback activityFeedback) {
-
-        Integer score_1 = activityFeedback.getScore_1();
-        Integer score_2 = activityFeedback.getScore_2();
-        Integer score_3 = activityFeedback.getScore_3();
-        Integer score = 0;
-        if (score_1 != null) score += score_1 * 4;
-        if (score_2 != null) score += score_2 * 4;
-        if (score_3 != null) score += score_3 * 12;
-        activityFeedback.setScore(score);
-        activityFeedback.setFeedback_time(new Date());
-        return this.saveSelective(activityFeedback);
-    }
-
-    /**
-     * @Author: huZhiHao
-     * @Description: 更新
-     * @Date: 2020/1/7
-     * @Params: [activityFeedback]
-     * @Return: java.lang.Integer
-     **/
-    public Integer feedbackUpdate(ActivityFeedback activityFeedback) {
-
-        if (activityFeedback.getIs_top() != null && activityFeedback.getIs_top()) {
-            activityFeedback.setIs_view(true);
-
-            ActivityFeedback temp1 = this.findById(activityFeedback.getId());
-            ActivityFeedback query = new ActivityFeedback();
-            query.setActivity_id(temp1.getActivity_id());
-            query.setIs_top(true);
-            ActivityFeedback temp2 = this.findOne(query);
-            if(temp2!=null){
-                temp2.setIs_top(false);
-                this.updateSelective(temp2);
-            }
-        }
-        if (activityFeedback.getIs_view() != null && !activityFeedback.getIs_view()) {
-            activityFeedback.setIs_top(false);
-        }
-        return this.updateSelective(activityFeedback);
-    }
-
-    /**
-     * @Author: huZhiHao
-     * @Description: 获取详情
-     * @Date: 2020/1/7
-     * @Params: [activityId, userId]
-     * @Return: platform.modules.sys.entity.ActivityFeedback
-     *
-     * @return*/
-    @Transactional(readOnly = true)
-    public List<ActivityFeedback> feedbackGet(String activityId, String userId) {
-
-        ActivityFeedback activityFeedback = new ActivityFeedback();
-        activityFeedback.setActivity_id(activityId);
-        activityFeedback.setUser_id(userId);
-        return this.findListByWhere(activityFeedback);
-    }
-
-    /**
-     * @Author: huZhiHao
-     * @Description: 获取分页
-     * @Date: 2020/1/7
-     * @Params: [activityId, pageNum, pageSize]
-     * @Return: com.github.pagehelper.PageInfo<platform.modules.sys.entity.ActivityFeedback>
-     **/
-    @Transactional(readOnly = true)
-    public PageInfo<ActivityFeedback> feedbackPage(String activityId, String minScore, String maxScore, Integer pageNum, Integer pageSize) {
-
-        PageHelper.startPage(pageNum, pageSize);
-        List<ActivityFeedback> page = activityFeedbackDao.feedbackPage(activityId, minScore, maxScore);
-        return new PageInfo<ActivityFeedback>(page);
-    }
-
-    @Transactional(readOnly = true)
-    public Map getScoreCount(String activityId, String isPublic, String isView, String minScore, String maxScore) {
-        int score100_80 = 0, score80_60 = 0, score60_40 = 0, score40_20 = 0, score20_0 = 0;
-        List<ActivityFeedback> feedbacks = activityFeedbackDao.feedbackList(activityId, isPublic, isView, minScore, maxScore);
-        for (ActivityFeedback feedback : feedbacks) {
-            Integer score = feedback.getScore();
-            if (score != null) {
-                if (score > 80) {
-                    score100_80++;
-                } else if (score > 60) {
-                    score80_60++;
-                } else if (score > 40) {
-                    score60_40++;
-                } else if (score > 20) {
-                    score40_20++;
-                } else if (score >= 0) {
-                    score20_0++;
-                }
-            }
-        }
-        Map<String, Integer> map = new HashMap();
-        map.put("score100_80", score100_80);
-        map.put("score80_60", score80_60);
-        map.put("score60_40", score60_40);
-        map.put("score40_20", score40_20);
-        map.put("score20_0", score20_0);
-        map.put("score_all", feedbacks.size());
-        return map;
-    }
-
 }

src/main/java/platform/modules/sys/service/ActivityRegistrationService.java

@@ -1,5 +1,6 @@
 package platform.modules.sys.service;
 
+import com.aliyuncs.exceptions.ClientException;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 
@@ -11,6 +12,7 @@ import platform.common.Constant;
 import platform.common.base.service.BaseService;
 import platform.common.util.AlibabaSMSUtil;
 import platform.common.util.ShiroUtils;
+import platform.modules.build.entity.Tenancy;
 import platform.modules.carrier.dto.ActivityStatistic;
 import platform.modules.government.entity.Attachment;
 import platform.modules.government.entity.FileDown;
@@ -20,10 +22,11 @@ import platform.modules.government.service.UserService;
 import platform.modules.home.service.HomeRefactorService;
 import platform.modules.sys.dao.ActivityRegistrationDao;
 import platform.modules.sys.entity.ActivityDetail;
+import platform.modules.sys.entity.ActivityFeedback;
 import platform.modules.sys.entity.ActivityRegistration;
 import platform.modules.sys.entity.ActivityReview;
 import platform.modules.sys.report.ActivityRegistrationExports;
-import platform.modules.sys.report.ActivitySignExports;
+import tk.mybatis.mapper.entity.Example;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -77,9 +80,10 @@ public class ActivityRegistrationService extends BaseService<ActivityRegistratio
         //已报名人数
         int registrationNumber = getActivityRegistrationNumber(activityRegistration.getActivity_id());
         User currUser = new User();
-        if (activityRegistration.getUser_id() != null && !activityRegistration.getUser_id().equals("")) {
+        if (activityRegistration.getUser_id() != null && !activityRegistration.getUser_id().equals("")){
             currUser = userService.findById(activityRegistration.getUser_id());
-        } else {
+        }
+        else {
             currUser = ShiroUtils.getUserEntity();
         }
         activityRegistration.setUser_id(currUser.getId());
@@ -87,16 +91,15 @@ public class ActivityRegistrationService extends BaseService<ActivityRegistratio
         if (Objects.equals(Constant.UserType.GOVERNMENT, currUser.getUser_type())) {
             activityRegistration.setRelation_id("0");
         } else if (Objects.equals(Constant.UserType.BUILD, currUser.getUser_type())) {
-            activityRegistration.setRelation_id(currUser.getBuild_id() + "");
+            activityRegistration.setRelation_id(currUser.getBuild_id()+ "");
         } else if (Objects.equals(Constant.UserType.STREET, currUser.getUser_type())) {
             activityRegistration.setRelation_id(currUser.getStreet_id() + "");
         } else if (Objects.equals(Constant.UserType.COMPANY, currUser.getUser_type())) {
             activityRegistration.setRelation_id(currUser.getCompany_id() + "");
-        } else if (Objects.equals(Constant.UserType.PERSONAL, currUser.getUser_type())) {
-            activityRegistration.setRelation_id(currUser.getId() + "");
-        } else if (Objects.equals(Constant.UserType.WECHAT, currUser.getUser_type())) {
+        }else if (Objects.equals(Constant.UserType.PERSONAL, currUser.getUser_type())) {
             activityRegistration.setRelation_id(currUser.getId() + "");
-            activityRegistration.setUser_type(currUser.getUser_type() + "");
+        } else {
+            activityRegistration.setUser_type("6");// 没有账号
         }
         activityRegistration.setRegistration_time(new Date());
         //签到状态 0已签到 1未签到
@@ -138,8 +141,6 @@ public class ActivityRegistrationService extends BaseService<ActivityRegistratio
             }*/
 
         }
-        if (activityRegistration.getId() != null)
-            return this.updateSelective(activityRegistration);
         return this.saveSelective(activityRegistration);
     }
 
@@ -182,12 +183,6 @@ public class ActivityRegistrationService extends BaseService<ActivityRegistratio
         return list.size();
     }
 
-    @Transactional(readOnly = true)
-    public List<ActivityRegistration> findByActivityIdAndUserIdAndPhones(String activity_id, String user_id, List<ActivityRegistration> registrations) {
-
-        return activityRegistrationDao.findByActivityIdAndUserIdAndPhones(activity_id, user_id, registrations);
-    }
-
 
     /**
      * 政府活动管理-签到信息
@@ -275,40 +270,12 @@ public class ActivityRegistrationService extends BaseService<ActivityRegistratio
             relationId = ShiroUtils.getStreetId().toString();
         } else if (Objects.equals(Constant.UserType.COMPANY, userType)) {
             relationId = ShiroUtils.getCompanyId().toString();
-        } else if (Objects.equals(Constant.UserType.PERSONAL, userType)) {
+        }else if (Objects.equals(Constant.UserType.PERSONAL, userType)) {
             relationId = ShiroUtils.getUserId().toString();
         }
         return activityRegistrationDao.findByRelationIdAndType(userType.toString(), relationId, activity_id);
     }
 
-    /**
-     * 获取当前账户所在单位已报名的
-     *
-     * @return
-     */
-    public List<ActivityRegistration> getCurrRegUsers(String activityId, String phone, String userId) {
-
-        /*User user = userService.findByMobile(phone);
-        if (user == null)
-            return null;
-        Integer userType = user.getUser_type();
-        String relationId = "";
-        if (Objects.equals(Constant.UserType.GOVERNMENT, userType)) {
-            relationId = "0";
-        } else if (Objects.equals(Constant.UserType.BUILD, userType)) {
-            relationId = user.getBuild_id().toString();
-        } else if (Objects.equals(Constant.UserType.STREET, userType)) {
-            relationId = user.getStreet_id().toString();
-        } else if (Objects.equals(Constant.UserType.COMPANY, userType)) {
-            relationId = user.getCompany_id().toString();
-        } else if (Objects.equals(Constant.UserType.PERSONAL, userType)) {
-            relationId = user.getId().toString();
-        } else if (Objects.equals(Constant.UserType.WECHAT, userType)) {
-            relationId = user.getId().toString();
-        }*/
-        return activityRegistrationDao.findByActivityUserIdPhone(activityId, phone, userId);
-    }
-
     /**
      * 获取当前账户所在单位已报名的
      *
@@ -317,8 +284,6 @@ public class ActivityRegistrationService extends BaseService<ActivityRegistratio
     public List<ActivityRegistration> getWechatCurrRegUsers(String activity_id, Integer user_id) {
 
         User user = userService.findById(user_id);
-        if (user == null)
-            return null;
         Integer userType = user.getUser_type();
 
         String relationId = "";
@@ -330,9 +295,7 @@ public class ActivityRegistrationService extends BaseService<ActivityRegistratio
             relationId = user.getStreet_id().toString();
         } else if (Objects.equals(Constant.UserType.COMPANY, userType)) {
             relationId = user.getCompany_id().toString();
-        } else if (Objects.equals(Constant.UserType.PERSONAL, userType)) {
-            relationId = user.getId().toString();
-        } else if (Objects.equals(Constant.UserType.WECHAT, userType)) {
+        }else if (Objects.equals(Constant.UserType.PERSONAL, userType)) {
             relationId = user.getId().toString();
         }
         return activityRegistrationDao.findByRelationIdAndType(userType.toString(), relationId, activity_id);
@@ -340,41 +303,41 @@ public class ActivityRegistrationService extends BaseService<ActivityRegistratio
 
     public Boolean sendActivityAbortSMS(ActivityDetail activity, List<ActivityRegistration> registrations) {
         //您报名的活动：${activity_title} 已取消。具体信息请登录PC端查看。感谢您的支持。
-        try {
-            if (null != registrations && registrations.size() > 0) {
+    	try {
+    		if (null != registrations && registrations.size() > 0) {
                 for (ActivityRegistration registration : registrations) {
                     String phone = registration.getPhone();
-                    if (StringUtils.isNotBlank(phone)) {
+                    if(StringUtils.isNotBlank(phone)) {
                         String activity_title = activity.getActivity_title();
                         String templateParam = "{\"activity_title\":\"" + activity_title + "\"}";
                         AlibabaSMSUtil.sendSMS(phone, Constant.SMS_TemplateCode.ACTIVITY_ABORT, "企业提升发展服务平台", templateParam);
                     }
                 }
             }
-            return true;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-
+    		return true;
+    	}catch(Exception e) {
+    		e.printStackTrace();
+    		return false;
+    	}
+        
     }
 
-    public Boolean sendActivityUpdateSMS(ActivityDetail activity, List<ActivityRegistration> registrations) {
+    public Boolean sendActivityUpdateSMS(ActivityDetail activity, List<ActivityRegistration> registrations){
         //您报名的活动：${activity_title} 活动内容有变更。具体信息请登录PC端查看。感谢您的支持。
-        try {
-            if (null != registrations && registrations.size() > 0) {
-                for (ActivityRegistration registration : registrations) {
-                    String phone = registration.getPhone();
-                    String activity_title = activity.getActivity_title();
-                    String templateParam = "{\"activity_title\":\"" + activity_title + "\"}";
-                    AlibabaSMSUtil.sendSMS(phone, Constant.SMS_TemplateCode.ACTIVITY_UPDATE, "企业提升发展服务平台", templateParam);
-                }
-            }
-            return true;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
+    	try {
+	        if (null != registrations && registrations.size() > 0) {
+	            for (ActivityRegistration registration : registrations) {
+	                String phone = registration.getPhone();
+	                String activity_title = activity.getActivity_title();
+	                String templateParam = "{\"activity_title\":\"" + activity_title + "\"}";
+	                AlibabaSMSUtil.sendSMS(phone, Constant.SMS_TemplateCode.ACTIVITY_UPDATE, "企业提升发展服务平台", templateParam);
+	            }
+	        }
+	        return true;
+        }catch(Exception e) {
+    		e.printStackTrace();
+    		return false;
+    	}
     }
 
     /**
@@ -393,8 +356,8 @@ public class ActivityRegistrationService extends BaseService<ActivityRegistratio
      * @param userId
      * @return
      */
-    public List<ActivityRegistration> getActivityRegistration(String activityId, String userId) {
-        return activityRegistrationDao.getActivityRegistration(activityId, userId);
+    public List<ActivityRegistration> getActivityRegistration(Integer activityId, int userId) {
+        return  activityRegistrationDao.getActivityRegistration(activityId, userId);
     }
 
     /**
@@ -420,9 +383,9 @@ public class ActivityRegistrationService extends BaseService<ActivityRegistratio
      * @param type
      * @return
      */
-    public List<ActivityDetail> findTypesActivitys(String type, Integer userId) {
+    public List<ActivityDetail> findTypesActivitys(String type, Integer userId){
         List<ActivityDetail> statistics = new ArrayList<>();
-        switch (type) {
+        switch (type){
             case "pending"://待参加
                 statistics = activityRegistrationDao.findPendingActivity(userId);
                 break;
@@ -450,9 +413,10 @@ public class ActivityRegistrationService extends BaseService<ActivityRegistratio
                 activity.setFileDown(fileDown);
             }
             //是否收藏
-            if (homeRefactorService.isFavourited(activity.getId(), userId)) {
+            if (homeRefactorService.isFavourited(activity.getId(), userId)){
                 activity.setIs_favourited("1");
-            } else {
+            }
+            else {
                 activity.setIs_favourited("0");
             }
             //活动回顾

src/main/java/platform/modules/sys/service/ActivityService.java

@@ -1,6 +1,5 @@
 package platform.modules.sys.service;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.aliyuncs.exceptions.ClientException;
 import com.github.pagehelper.PageHelper;
@@ -8,7 +7,6 @@ import com.github.pagehelper.PageInfo;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -16,7 +14,10 @@ import platform.common.Constant;
 import platform.common.base.model.DictionaryItem;
 import platform.common.base.service.BaseService;
 import platform.common.base.service.DictionaryItemService;
-import platform.common.util.*;
+import platform.common.util.AlibabaSMSUtil;
+import platform.common.util.DateUtil;
+import platform.common.util.ShiroUtils;
+import platform.common.util.WebUtil;
 import platform.modules.build.entity.BuildInfo;
 import platform.modules.government.dao.AttachmentDao;
 import platform.modules.government.dto.*;
@@ -35,8 +36,6 @@ import platform.modules.sys.entity.ActivityPush;
 import platform.modules.sys.entity.ActivityRegistration;
 import tk.mybatis.mapper.entity.Example;
 
-import java.io.IOException;
-import java.io.InputStream;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -480,18 +479,18 @@ public class ActivityService extends BaseService<ActivityDetail> {
         List<ActivityDetail> dates = activityDetailDao.getEventList(start1, start2, null, ShiroUtils.getUserId());
         return dates;
     }
-
+    
     public Integer getAllActivityCount() {
         int count = activityDetailDao.getAllActivityCount();
         return count;
     }
-
+    
     public Integer getJoinedActivityCount() {
-        SearchCondition condition = new SearchCondition();
-        if (ShiroUtils.getUserType().equals(Constant.UserType.STREET)) {
-            condition.setUser_type(Constant.UserType.STREET);
-            condition.setStreet_id(ShiroUtils.getStreetId());
-        }
+    	SearchCondition condition = new SearchCondition();
+    	if(ShiroUtils.getUserType().equals(Constant.UserType.STREET)) {
+			condition.setUser_type(Constant.UserType.STREET);
+			condition.setStreet_id(ShiroUtils.getStreetId());
+		}
         int count = activityDetailDao.getJoinedActivityCount(condition);
         return count;
     }
@@ -517,17 +516,19 @@ public class ActivityService extends BaseService<ActivityDetail> {
                     FileDown fileDown = new FileDown(attachments.get(0).getId(), attachments.get(0).getFile_name(), attachments.get(0).getFile_url(), request.getFile_url());
                     ad.setFileDown(fileDown);
                 }
-                if (ad.getActivity_deadline() != null) {
+                if (ad.getActivity_deadline() != null){
                     LocalDateTime deadline = LocalDateTime.parse(ad.getActivity_deadline(), formatter);
-                    if (!deadline.isBefore(LocalDateTime.now())) {
+                    if (!deadline.isBefore(LocalDateTime.now())){
                         ad.setCan_sign_up(true);
                     }
-                } else {
+                }
+                else {
                     ad.setCan_sign_up(true);
                 }
-                if (homeRefactorService.isFavourited(ad.getId(), request.getUser_id())) {
+                if (homeRefactorService.isFavourited(ad.getId(), request.getUser_id())){
                     ad.setIs_favourited("1");
-                } else {
+                }
+                else {
                     ad.setIs_favourited("0");
                 }
             }
@@ -537,7 +538,6 @@ public class ActivityService extends BaseService<ActivityDetail> {
 
     /**
      * 获取已结束的活动列表
-     *
      * @param condition
      * @return
      */
@@ -582,9 +582,9 @@ public class ActivityService extends BaseService<ActivityDetail> {
 //        ActivityDetail detail = this.findById(id);
         ActivityDetail detail = activityDetailDao.findByActivityId(id);
 
-        PageHelper.startPage(pageNum, 5);
+        PageHelper.startPage(pageNum,5);
         List<ActivityRegistration> registrations =
-                activityRegistrationService.getActivityRegistration(id+"", ShiroUtils.getUserId()+"");
+                activityRegistrationService.getActivityRegistration(id, ShiroUtils.getUserId());
         ActivityOrderDetail orderDetail = new ActivityOrderDetail();
         orderDetail.setActivityDetail(detail);
         orderDetail.setActivityRegistration(new PageInfo<>(registrations));
@@ -607,9 +607,9 @@ public class ActivityService extends BaseService<ActivityDetail> {
     /**
      * 强烈推荐
      *
+     * @return
      * @param pageNum
      * @param pageSize
-     * @return
      */
     public PageInfo<ActivityDetail> findHighlyRecommended(Integer pageNum, Integer pageSize) {
         PageHelper.startPage(pageNum, pageSize);
@@ -624,45 +624,5 @@ public class ActivityService extends BaseService<ActivityDetail> {
         }
         return new PageInfo<>(highlyRecommendedList);
     }
-
-    /**
-     * @Author: huZhiHao
-     * @Description: 获取二维码 1 详情 2 签到
-     * @Date: 2019/12/19
-     * @Params: [accessToken, type, width, scene]
-     * @Return: java.io.InputStream
-     **/
-    public InputStream getQRcode(String type, String width, String scene) {
-
-        String obj = WxAppUtil.getAccessToken(APP_ID, APP_SERCRET);
-        System.out.println("access_token:" + obj);
-        String access_token = JSON.parseObject(obj).getString("access_token");
-
-        String path = "";
-        InputStream is = null;
-        try {
-            if (Objects.equals("1", type)) {
-                path = ACTIVITY_PAGE_PATH_DETAIL;
-            } else if (Objects.equals("2", type)) {
-                path = ACTIVITY_PAGE_PATH_SIGN;
-            }
-            is = WxAppUtil.getUnlimitedQRCode(access_token, path, width, scene);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return is;
-    }
-
-    @Value("${app_id}")
-    private String APP_ID;
-
-    @Value("${app_sercet}")
-    private String APP_SERCRET;
-
-    @Value("${activity_page_path_detail}")
-    private String ACTIVITY_PAGE_PATH_DETAIL;
-
-    @Value("${activity_page_path_sign}")
-    private String ACTIVITY_PAGE_PATH_SIGN;
 }
 

src/main/java/platform/modules/sys/service/ApprovalService.java

@@ -6,7 +6,6 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -126,7 +125,7 @@ public class ApprovalService extends BaseService<Approval> {
     private List<Department> getPendingAuditDepts(Integer apply_id, List<String> userIdArr, List<Approval> approvals) {
         //总共需要审核的部门
         List<Department> allDepts = departmentService.getAllUserDepts(userIdArr);
-        if (approvals.size() == 0) {
+        if (approvals.size() == 0){
             try {
                 throw new Exception("没有审批流程");
             } catch (Exception e) {
@@ -309,21 +308,6 @@ public class ApprovalService extends BaseService<Approval> {
         return approvals;
     }
 
-    //查询流程信息
-    public List<Approval> getApprovalList(Integer apply_id, String dictType, String approveStatusType) {
-        Example example = new Example(Approval.class);
-        Example.Criteria criteria = example.createCriteria();
-        criteria.andEqualTo("apply_id", apply_id);
-        criteria.andEqualTo("type", dictType);
-        List<Approval> approvals = this.selectByExample(example);
-        for (Approval approval : approvals) {
-            if (StringUtils.isNotBlank(approval.getBefore_approvalstatus())) {
-                approval.setBefore_approvalstatus_str(dictionaryItemService.findNameByTypeAndValue(approveStatusType, approval.getBefore_approvalstatus()));
-            }
-        }
-        return approvals;
-    }
-
     public List<CenterBusiness> getCenterBusiness(BusinessSearchDto businessSearchDto) {
         return approvalDao.getCenterBusiness(businessSearchDto);
     }
@@ -371,10 +355,6 @@ public class ApprovalService extends BaseService<Approval> {
         return approvalDao.getBusinessAcceptNum(businessSearchDto);
     }
 
-    public List<Approval> selectAllApproval(String type) {
-        return approvalDao.selectAllApproval(type);
-    }
-
     /**
      * 获取流程信息
      *

src/main/resources/application.yml

@@ -15,13 +15,13 @@ spring:
   #激活哪一个环境的配置文件
   profiles:
 
-    active: dev
-#    active: test
-#    active: aliyun
-#    active: vpn
-#    active: prod_in
-#    active: prod_out
-#    active: prod_test
+  #  active: dev
+  #    active: test
+      active: aliyun
+  #    active: vpn
+  #    active: prod_in
+  #    active: prod_out
+  #    active: prod_test
 
   #数据源
   datasource:
@@ -128,50 +128,32 @@ pagehelper:
   params: count=countSql
 
 
-#测试小程序
-#app_id
-app_id: wx3007d6086b29908c
 
-#app_sercet
-app_sercet: 68245dbd037f7516bcbe0eeafc1e01a9
-
-# 正式小程序
-##app_id
-#app_id: wx27a06edbe6042585
-#
-##app_sercet
-#app_sercet: 10a09d22fb48ba84f892bbde056dac06
-
-activity_page_path_detail: pages/activity/activityDetail/main
-
-activity_page_path_sign: pages/activity/signInDetail/main
 ---
 
 #开发环境配置
 server:
   #端口
-  port: 8080
+  port: 8084
   context-path: /myboot
 
 spring:
   profiles: dev
   #数据源
   datasource:
-#    url: jdbc:mysql://192.168.1.115:3306/service_platform?useUnicode=true&characterEncoding=utf-8&useSSL=true&autoReconnect=true&allowMultiQueries=true
-    url: jdbc:mysql://222.92.16.3:33061/service_platform?useUnicode=true&characterEncoding=utf-8&useSSL=true&autoReconnect=true&allowMultiQueries=true
-#    url: jdbc:mysql://10.44.104.42:3306/service_platform?useUnicode=true&characterEncoding=utf-8&useSSL=true&autoReconnect=true&allowMultiQueries=true
+    url: jdbc:mysql://192.168.1.115:3306/service_platform?useUnicode=true&characterEncoding=utf-8&useSSL=true&autoReconnect=true&allowMultiQueries=true
     username: root
     password: ${password}
-  #redis
-  redis:
-    host: 192.168.1.115
-    password:
-    port: 6379
-    pool:
-      max-idle: 300
-      min-idle: 20
-      max-active: 600
-      max-wait: 2000
+    #redis
+    redis:
+      host: 192.168.1.115
+      password:
+      port: 6379
+      pool:
+        max-idle: 300
+        min-idle: 20
+        max-active: 600
+        max-wait: 2000
 #日志
 logging:
   config: classpath:logback-jk.xml
@@ -179,8 +161,8 @@ logging:
 
 #数据库密码加密
 #java -cp druid-1.1.0.jar com.alibaba.druid.filter.config.ConfigTools 你的密码
-publicKey: MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAIYbzRqmoxLzAPpQer64U9MI+2WQOHMMl6BsYvSfBVodl2VjosyLSFDTu9UKYNh8P7cDujohKjc8GDiH6i/wq08CAwEAAQ==
-password: WD7ZuG4T27mDBFRXye2IfZZgrDsmPCtkMDfj8fGss8Iz/4aF27TLznaZ2mUbU273q5spfMzqUTmCiR1GvXZRMA==
+publicKey: MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALw6xjHT/QV52gcADFaltXUZ1DRFhqj//Jv3lKQS4oTxJS1xuziVfA/iPX39P/7C1D4hJ6giolAMXzoAtd+MuP8CAwEAAQ==
+password: MlDcZS8463xfTRe8W0n/OeCcBofRF11E3ttKoL8jV5yVZ5zOhBUKV0mJ5tw+bCjbxAYNAwH9vtAYfUfuPfjNdQ==
 
 #上传文件配置信息
 #文件仓库地址
@@ -191,7 +173,7 @@ api_url: http://snd.ideatob.com/mp/api/
 apk_url: E:\UPLOAD\
 
 #访问路径
-fileUrl: http://192.168.1.116:8001/uploads
+fileUrl: http://10.43.26.100:81
 
 #域名
 service_name: 127.0.0.1
@@ -203,18 +185,18 @@ carrier_hash_key: industrial_carrier_token
 #test环境配置
 server:
   #端口
-  port: 8080
+  port: 8084
   context-path: /myboot
 spring:
   profiles: test
   #数据源
   datasource:
-    url: jdbc:mysql://192.168.1.115:3306/service_platform_42_backup?useUnicode=true&characterEncoding=utf-8&useSSL=true&autoReconnect=true&allowMultiQueries=true
+    url: jdbc:mysql://10.43.26.100:3306/service_platform?useUnicode=true&characterEncoding=utf-8&useSSL=true&autoReconnect=true&allowMultiQueries=true
     username: root
     password: ${password}
   #redis
   redis:
-    host: 192.168.1.115
+    host: 10.43.26.100
     password:
     port: 6379
     pool:
@@ -229,8 +211,8 @@ logging:
 
 #数据库密码加密
 #java -cp druid-1.1.0.jar com.alibaba.druid.filter.config.ConfigTools 你的密码
-publicKey: MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALA0LQXJvedvvS14LNKRXjLKOaudFAZILec5nturiNsRV7rK0FkSdXAlf7odQb9nZtDai+Bfn/4zC52xMr+KL6sCAwEAAQ==
-password: hTeoaFouO30aePF/U0NVf6bZCqh31q//05vP+uC7KnNDW2R3MOaQyEbzigzUVFEzVgZDtB+8FKllETyPfK3tUw==
+publicKey: MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKZUID/DlXXhYmpwNOzra74upqLSJea2xp1ao3cSy6rLxRty5X/o2nBXa0T88+wG53oAgd7rdRDR1zWJ3k3p1pkCAwEAAQ==
+password: c/2+OGu4dbvV4KvR9NXMnTso02gEqhvTQ3kcetSduEP1KRuoxKDPtaMvE+cB6vhkM91uLY2rFBLgpr0TiTQaDg==
 
 #上传文件配置信息
 #文件仓库地址
@@ -245,25 +227,22 @@ fileUrl: http://10.43.26.201
 
 #域名
 service_name: 127.0.0.1
-
-#key
-carrier_hash_key: industrial_carrier_token
 ---
 #阿里环境配置
 server:
   #端口
-  port: 8080
+  port: 8082
   context-path: /myboot
 spring:
   profiles: aliyun
   #数据源
   datasource:
-    url: jdbc:mysql://47.105.241.108:33060/service_platform_42_backup?useUnicode=true&characterEncoding=utf-8&useSSL=true&autoReconnect=true&allowMultiQueries=true
+    url: jdbc:mysql://47.105.241.108:33060/service_platform?useUnicode=true&characterEncoding=utf-8&useSSL=true&autoReconnect=true&allowMultiQueries=true
     username: root
     password: ${password}
   #redis
   redis:
-    host: 192.168.1.115
+    host: 47.105.241.108
     password:
     port: 6379
     pool:
@@ -325,7 +304,6 @@ spring:
 #日志
 logging:
   config: classpath:logback-jk.xml
-  level: debug
 #  path: /logs
 
 #数据库密码加密
@@ -392,10 +370,10 @@ repositoryPath: /opt/xinqu_pic
 api_url: http://snd.ideatob.com/mp/api/
 
 #访问路径
-fileUrl: http://escloud.snd.gov.cn/uploads
+fileUrl: http://202.102.20.60:8095/uploads
 
 #访问外网路径
-fileOutUrl: http://escloud.snd.gov.cn/uploads
+fileOutUrl: http://202.102.20.60:8095/uploads
 
 #apk文件存放地址
 apk_url: /opt/xinqu_pic/apk/

src/main/resources/mapper/carrier/BuildingDao.xml

@@ -603,33 +603,4 @@
         GROUP BY
             s.id
     </select>
-
-    <select id="factoryBuildingCount" resultType="platform.modules.api.dto.SkyImageCount">
-        SELECT
-        b.no,
-        IFNULL(SUM( f.remain_area ), 0) AS buildingArea,
-        IFNULL(SUM( cf.area ),0) AS rentArea
-        FROM
-        ic_building b
-        LEFT JOIN y_floor f ON f.building_id = b.id
-        LEFT JOIN ic_contract_floor cf ON cf.floor_id = f.id
-        WHERE
-        b.del_flag = FALSE AND b.is_use = 1 AND f.del_flag = FALSE AND f.is_use = 1 AND cf.status = 2
-        AND cf.contract_end > NOW( )
-    </select>
-
-    <select id="findEndContractByTime" resultType="platform.modules.api.dto.SkyImageCount">
-        SELECT
-        DISTINCT b.`no` as no
-        FROM
-        ic_building b
-        LEFT JOIN ic_contract_floor cf ON cf.building_id = b.id
-        WHERE b.del_flag = 0 AND b.is_use = 1 AND cf.del_flag = 0
-        <if test="startTime != null and startTime != ''">
-            AND cf.contract_end > #{startTime}
-        </if>
-        <if test="endTime != null and endTime != ''">
-            AND cf.contract_end <![CDATA[<]]> #{endTime}
-        </if>
-    </select>
 </mapper>

src/main/resources/mapper/carrier/ContractFloorDao.xml

@@ -62,15 +62,4 @@
         GROUP BY
             s.id
     </select>
-
-    <select id="findEndContractByTime" resultType="platform.modules.carrier.entity.CarrierVolume">
-        SELECT cf.id FROM ic_contract_floor cf
-        WHERE cf.building_id = #{id} AND cf.del_flag = 0
-        <if test="startTime != null and startTime != ''">
-            AND cf.contract_end > #{startTime}
-        </if>
-        <if test="endTime != null and endTime != ''">
-            AND cf.contract_end <![CDATA[<]]> #{endTime}
-        </if>
-    </select>
 </mapper>

src/main/resources/mapper/government/ProjectDeclarationDao.xml

@@ -39,12 +39,12 @@
 
         select * from project_declaration where id = #{id}
     </select>
-
+    
     <select id="findByCondition" resultType="platform.modules.government.entity.ProjectDeclaration">
         SELECT distinct
-        p.* FROM
-        project_declaration p
-        LEFT JOIN notices_accept n on n.recorde_id = p.id
+        	p.* FROM 
+        	project_declaration p 
+        	LEFT JOIN notices_accept n on n.recorde_id = p.id
         where 1=1
         <if test="projectName != null and projectName != '' ">
             and p.project_name LIKE CONCAT ('%',#{projectName},'%')
@@ -62,27 +62,26 @@
             and p.apply_endDate <![CDATA[<=]]> left(#{endTime2},10)
         </if>
         <if test="request.company_id != null and request.company_id != '' ">
-            and n.user_id = #{request.company_id}
+        	and n.user_id = #{request.company_id}
         </if>
         <if test="request.isActive != null and request.isActive != '' ">
-            and p.apply_startDate <![CDATA[<=]]> left(now(),10)
-            and p.apply_endDate <![CDATA[>=]]> left(now(),10)
-            and p.status != 0
+        	and p.apply_startDate <![CDATA[<=]]> left(now(),10)
+        	and p.apply_endDate <![CDATA[>=]]> left(now(),10)
+        	and p.status != 0
         </if>
         <if test="searchCondition.is_online_application != null ">
-            and p.is_online_application =#{searchCondition.is_online_application}
+        	and p.is_online_application =#{searchCondition.is_online_application} 
         </if>
         order by p.create_time desc
     </select>
 
-    <select id="findUnionProjectsOnHome" resultType="platform.modules.government.entity.ProjectDeclaration">
+	<select id="findUnionProjectsOnHome" resultType="platform.modules.government.entity.ProjectDeclaration">
         <if test="request.type != null and request.type != '' and request.type =='4'.toString()">
             select * from
             (
             SELECT
-            a.id,a.project_name,a.create_time,a.project_source,a.apply_enddate,0 as isFilling,a.project_content AS
-            content
-            FROM project_declaration a
+            a.id,a.project_name,a.create_time,a.project_source,a.apply_enddate,0 as isFilling,a.project_content AS content
+            FROM  project_declaration a
             where
             a.del_flag=0
             and a.is_open = 1
@@ -106,9 +105,8 @@
             select * from
             (
             SELECT
-            a.id,a.project_name,a.create_time,a.project_source,a.apply_enddate,0 as isFilling,a.project_content AS
-            content
-            FROM project_declaration a
+            a.id,a.project_name,a.create_time,a.project_source,a.apply_enddate,0 as isFilling,a.project_content AS content
+            FROM  project_declaration a
             where
             a.del_flag=0
             and a.is_open = 1
@@ -124,28 +122,21 @@
             from project_intelligent_declaration b
             where b.del_flag = 0 and b.status=1
             ) temp
-            where 1=1
-            <if test="request.startTime !='' and request.startTime !=null ">
-                and temp.create_time <![CDATA[>=]]> #{request.startTime}
-            </if>
-            <if test="request.endTime !='' and request.endTime !=null ">
-                and temp.create_time <![CDATA[<=]]> #{request.endTime}
-            </if>
             order by temp.create_time desc
         </if>
 
-    </select>
-    <select id="findProjectsOnHome" resultType="platform.modules.government.entity.ProjectDeclaration">
+	</select>
+	<select id="findProjectsOnHome" resultType="platform.modules.government.entity.ProjectDeclaration">
         SELECT
         a.project_name,a.id,a.create_time,a.project_source,a.apply_enddate
-        FROM project_declaration a
-        where
-        a.del_flag=0
-        and a.is_open = 1
-        and a.status = 1
+        FROM  project_declaration a
+        where 
+        	a.del_flag=0
+        	and a.is_open = 1
+        	and a.status = 1
         <if test="request.keyword!=null and request.keyword!=''">
             and a.project_name LIKE CONCAT ('%',#{ request.keyword},'%')
-
+             
         </if>
         <if test="request.type!=null and request.type!=''">
             and a.project_source = #{ request.type}
@@ -153,18 +144,18 @@
         order by a.create_time desc
         limit #{request.start},#{request.page_size}
     </select>
-
+    
     <select id="findProjectsCountOnHome" resultType="integer">
         SELECT
         count(0)
-        FROM project_declaration a
+        FROM project_declaration a 
         where a.del_flag = 0
-        and a.is_open = 1
-        and a.status = 1
+        	and a.is_open = 1
+        	and a.status = 1
         <if test="request.keyword!=null and request.keyword!=''">
             and a.project_name LIKE CONCAT ('%',#{ request.keyword},'%')
         </if>
-        <if test="request.type!=null and request.type!=''">
+		<if test="request.type!=null and request.type!=''">
             and a.project_source = #{ request.type}
         </if>
     </select>

src/main/resources/mapper/sys/ActivityFeedbackDao.xml

@@ -87,46 +87,4 @@
     <select id="findUserFeedback" resultType="platform.modules.sys.entity.ActivityFeedback">
         select * from ac_activity_feedback where activity_id = #{id} AND user_id = #{userId} AND feedback_type != 0
     </select>
-
-    <select id="feedbackList" resultType="platform.modules.sys.entity.ActivityFeedback">
-        SELECT
-            *
-        FROM
-            ac_activity_feedback
-        WHERE
-            del_flag = 0
-            AND activity_id = #{activity_id}
-        <if test="is_public != null and is_public != ''">
-            AND is_public = #{is_public}
-        </if>
-        <if test="is_view != null and is_view != ''">
-            AND is_view = #{is_view}
-        </if>
-        <if test="minScore != null and minScore != ''">
-            AND score <![CDATA[>]]> #{minScore}
-        </if>
-        <if test="maxScore != null and maxScore != ''">
-            AND score <![CDATA[<=]]> #{maxScore}
-        </if>
-        ORDER BY is_top DESC
-    </select>
-
-    <select id="feedbackPage" resultType="platform.modules.sys.entity.ActivityFeedback">
-        SELECT
-            *
-        FROM
-            ac_activity_feedback
-        WHERE
-            del_flag = 0
-        AND
-            activity_id = #{activity_id}
-        <if test="minScore != null and minScore != ''">
-            AND score <![CDATA[>]]> #{minScore}
-        </if>
-        <if test="maxScore != null and maxScore != ''">
-            AND score <![CDATA[<=]]> #{maxScore}
-        </if>
-        ORDER BY
-            feedback_time DESC
-    </select>
 </mapper>

src/main/resources/mapper/sys/ActivityRegistrationDao.xml

@@ -59,7 +59,7 @@
             UNION
             SELECT
                 z.id id,
-                s.name name,
+                '政府' name,
                 '0' type
             FROM
                 sys_department s
@@ -71,14 +71,6 @@
                 '5' type
             FROM
                 z_user u
-            UNION
-            SELECT
-                z.id id,
-                a.company_name name,
-                '6' type
-            FROM
-                ac_activity_registration a
-            JOIN z_user z ON z.id = a.user_id
         ) zuser ON reg.user_id = zuser.id
         AND reg.user_type = zuser.type
         WHERE
@@ -100,8 +92,7 @@
             reg.registration_way registration_way,
             reg.review_state review_state,
             reg.sign_state sign_state,
-            reg.registration_time registration_time,
-            reg.sign_time sign_time
+            reg.registration_time registration_time
         FROM
             ac_activity_registration reg
         LEFT JOIN (
@@ -131,32 +122,15 @@
             UNION
             SELECT
                 z.id id,
-                s.name name,
+                '政府' name,
                 '0' type
             FROM
                 sys_department s
             JOIN z_user z ON z.department_id = s.id
-            UNION
-            SELECT
-                id,
-                '个人' name,
-                '5' type
-            FROM
-                z_user u
-            UNION
-            SELECT
-                z.id id,
-                a.company_name name,
-                '6' type
-            FROM
-                ac_activity_registration a
-            JOIN z_user z ON z.id = a.user_id
         ) zuser ON reg.user_id = zuser.id
         AND reg.user_type = zuser.type
         WHERE
-            reg.del_flag = 0
-            AND reg.activity_id = #{activityId}
-            AND reg.review_state != 3
+            reg.activity_id = #{activityId}
     </select>
 
     <select id="findMyActivityPage" parameterType="platform.modules.sys.entity.ActivityRegistration"
@@ -291,50 +265,13 @@
         FROM
             ac_activity_registration reg
         WHERE
-            reg.del_flag = 0
-        and reg.user_type = #{type}
+            reg.user_type = #{type}
         and reg.relation_id =#{rel}
         and reg.activity_id =#{activity_id}
         ORDER BY
             reg.create_time ASC
     </select>
 
-    <select id="findByActivityIdAndUserIdAndPhones" resultType="platform.modules.sys.entity.ActivityRegistration">
-        SELECT
-        reg.*
-        FROM
-        ac_activity_registration reg
-        WHERE
-        reg.del_flag = 0
-        AND reg.review_state != 3
-        AND reg.activity_id = #{activity_id}
-        AND reg.user_id != #{user_id}
-        AND reg.phone IN
-        <foreach collection="registrations" index="index" item="item" open="(" separator="," close=")">
-            #{item.phone}
-        </foreach>
-    </select>
-
-    <select id="findByActivityUserIdPhone"
-            resultType="platform.modules.sys.entity.ActivityRegistration">
-
-       SELECT
-           *
-        FROM
-            ac_activity_registration reg
-        WHERE
-            reg.del_flag = 0
-        and reg.activity_id = #{activity_id}
-        <if test="phone != null and phone != '' ">
-            and reg.phone = #{phone}
-        </if>
-        <if test="user_id != null and user_id != '' ">
-            and reg.user_id = #{user_id}
-        </if>
-        ORDER BY
-            reg.create_time ASC
-    </select>
-
     <select id="findRegistrationExport" parameterType="java.lang.Integer"
             resultType="platform.modules.sys.report.ActivityRegistrationExports">
 
@@ -379,7 +316,7 @@
             UNION
             SELECT
                 z.id id,
-                s.name name,
+                '政府' name,
                 '0' type
             FROM
                 sys_department s
@@ -497,7 +434,7 @@
         (
         ad.activity_starttime > now( ),
         IF
-        ( ( SELECT DISTINCT review_state FROM ac_activity_registration WHERE activity_id = ad.id AND review_state!=3 AND user_id = #{userId} ) = 1, 'pending', 'expired' ),
+        ( ( SELECT DISTINCT review_state FROM ac_activity_registration WHERE activity_id = ad.id AND user_id = #{userId} ) = 1, 'pending', 'expired' ),
         IF
         (
         ad.activity_endtime <![CDATA[ < ]]> now( ),

src/main/resources/mapper/sys/ActivityReviewDao.xml

@@ -15,7 +15,6 @@
         <if test="condition.title != null and condition.title != ''">
            and ad.activity_title like concat('%',#{condition.title}, '%')
         </if>
-        order by ad.create_time desc
     </select>
 
     <update id="batchUpdate">

src/main/resources/templates/admin/common/header.html

@@ -16,100 +16,45 @@
         <nav id="topNav" class="nav navbar-nav">
             <ul th:if="${user_type}==0"><!-- 政府 -->
                 <li class=" navbar-levelone current"><a href="#">首页</a></li>
-                <li class=" navbar-levelone " data-module="G_HOME_MANAGE"><a href="#"
-                                                                             shiro:hasPermission="G_HOME_MANAGE">网站管理</a>
-                </li>
-                <li class=" navbar-levelone " data-module="G_NOTIFY_MANAGE"><a href="#"
-                                                                               shiro:hasPermission="G_NOTIFY_MANAGE">消息管理</a>
-                </li>
-                <li class=" navbar-levelone " data-module="G_SERVICE_MANAGE"><a href="#"
-                                                                                shiro:hasPermission="G_SERVICE_MANAGE">政务服务管理</a>
-                </li>
-                <li class=" navbar-levelone " data-module="G_DATA_MANAGE"><a href="#"
-                                                                             shiro:hasPermission="G_DATA_MANAGE">大数据管理</a>
-                </li>
-                <li class=" navbar-levelone " data-module="G_INDUSTRIAL_CARRIER"><a href="#"
-                                                                                    shiro:hasPermission="G_INDUSTRIAL_CARRIER"
-                                                                                    onclick="redirectToIndustrialCarrier()">工业载体</a>
-                </li>
-                <li class="dropDown dropDown_hover"><a href="#" class="dropDown_A">应用中心<i class="Hui-iconfont">&#xe6d5;</i></a>
-                    <ul class="dropDown-menu menu radius box-shadow">
-                        <li><a href="https://xsg.tq.geostsapp.cn/xgkfq/infoCollect/#/index" data-title="工业资源" target="_blank">工业资源</a></li>
-                        <li><a onclick="checkLogin1('azw')" data-title="安专委平台">安专委平台</a></li>
-                        <li><a onclick="checkLogin1('dljk')" data-title="电炉监控系统">电炉监控系统</a></li>
-                        <li><a onclick="checkLogin1('lyjj')" data-title="楼宇经济管理平台">楼宇经济管理平台</a></li>
-                        <li><a href="http://escloud.snd.gov.cn/home/serverDetail/78" data-title="境外投资项目备案系统" target="_blank">境外投资项目备案系统</a></li>
-                    </ul>
-                </li>
-                <li class=" navbar-levelone " data-module="G_EPIDEMIC_SERVICE"><a href="#"
-                                                                                  shiro:hasPermission="G_EPIDEMIC_SERVICE"
-                                                                                  onclick="redirectToEpidemicService()">疫情云</a>
-                </li>
-                <li class=" navbar-levelone " data-module="G_SYS_MANAGE"><a href="#" shiro:hasPermission="G_SYS_MANAGE">系统管理</a>
-                </li>
+                <li class=" navbar-levelone " data-module="G_HOME_MANAGE"><a href="#" shiro:hasPermission="G_HOME_MANAGE">网站管理</a></li>
+                <li class=" navbar-levelone " data-module="G_NOTIFY_MANAGE"><a href="#" shiro:hasPermission="G_NOTIFY_MANAGE">消息管理</a></li>
+                <li class=" navbar-levelone " data-module="G_SERVICE_MANAGE"><a href="#" shiro:hasPermission="G_SERVICE_MANAGE">政务服务管理</a></li>
+                <li class=" navbar-levelone " data-module="G_DATA_MANAGE"><a href="#" shiro:hasPermission="G_DATA_MANAGE">大数据管理</a></li>
+                <li class=" navbar-levelone " data-module="G_INDUSTRIAL_CARRIER"><a href="#" shiro:hasPermission="G_INDUSTRIAL_CARRIER"
+                                                 onclick="redirectToIndustrialCarrier()">工业载体</a></li>
+                <li class=" navbar-levelone " data-module="G_SYS_MANAGE"><a href="#" shiro:hasPermission="G_SYS_MANAGE">系统管理</a></li>
             </ul>
             <ul th:if="${user_type}==1"><!-- 园区 -->
                 <li class=" navbar-levelone " data-module="HOME"><a href="#">首页</a></li>
-                <li class=" navbar-levelone " data-module="Y_NOTIFY_MANAGE"><a href="#"
-                                                                               shiro:hasPermission="Y_NOTIFY_MANAGE">消息管理</a>
-                </li>
-                <li class=" navbar-levelone " data-module="Y_SERVICE_MANAGE"><a href="#"
-                                                                                shiro:hasPermission="Y_SERVICE_MANAGE">政务服务管理</a>
-                </li>
-                <li class=" navbar-levelone " data-module="Y_BUILD_MANAGE"><a href="#"
-                                                                              shiro:hasPermission="Y_BUILD_MANAGE">园区管理</a>
-                </li>
-                <li class=" navbar-levelone " data-module="Y_CUSTOMER_MANAGE"><a href="#"
-                                                                                 shiro:hasPermission="Y_CUSTOMER_MANAGE">客户管理</a>
-                </li>
-                <li class=" navbar-levelone " data-module="Y_PROPERTY_MANAGE"><a href="#"
-                                                                                 shiro:hasPermission="Y_PROPERTY_MANAGE">物业管理</a>
-                </li>
-                <li class=" navbar-levelone " data-module="Y_INDUSTRIAL_CARRIER"><a
-                        onclick="redirectToIndustrialCarrier()" href="#"
-                        shiro:hasPermission="Y_INDUSTRIAL_CARRIER">工业载体</a></li>
-                <li class=" navbar-levelone " data-module="Y_SYS_MANAGE"><a href="#" shiro:hasPermission="Y_SYS_MANAGE">系统管理</a>
-                </li>
+                <li class=" navbar-levelone " data-module="Y_NOTIFY_MANAGE"><a href="#" shiro:hasPermission="Y_NOTIFY_MANAGE">消息管理</a></li>
+                <li class=" navbar-levelone " data-module="Y_SERVICE_MANAGE"><a href="#" shiro:hasPermission="Y_SERVICE_MANAGE">政务服务管理</a></li>
+                <li class=" navbar-levelone " data-module="Y_BUILD_MANAGE"><a href="#" shiro:hasPermission="Y_BUILD_MANAGE">园区管理</a></li>
+                <li class=" navbar-levelone " data-module="Y_CUSTOMER_MANAGE"><a href="#" shiro:hasPermission="Y_CUSTOMER_MANAGE">客户管理</a></li>
+                <li class=" navbar-levelone " data-module="Y_PROPERTY_MANAGE"><a href="#" shiro:hasPermission="Y_PROPERTY_MANAGE">物业管理</a></li>
+                <li class=" navbar-levelone " data-module="Y_INDUSTRIAL_CARRIER"><a onclick="redirectToIndustrialCarrier()" href="#"
+                                                 shiro:hasPermission="Y_INDUSTRIAL_CARRIER">工业载体</a></li>
+                <li class=" navbar-levelone " data-module="Y_SYS_MANAGE"><a href="#" shiro:hasPermission="Y_SYS_MANAGE">系统管理</a></li>
             </ul>
             <ul th:if="${user_type}==3"><!-- 企业 -->
                 <li class=" navbar-levelone " data-module="HOME"><a href="#">首页</a></li>
-                <li class=" navbar-levelone " data-module="C_NOTIFY_MANAGE"><a href="#"
-                                                                               shiro:hasPermission="C_NOTIFY_MANAGE">消息管理</a>
-                </li>
-                <!--                <li class=" navbar-levelone " data-module="C_PROPERTY_MANAGE"><a href="#" shiro:hasPermission="C_PROPERTY_MANAGE">物业管理</a></li>-->
-                <li class=" navbar-levelone " data-module="C_SERVICE_MANAGE"><a href="#"
-                                                                                shiro:hasPermission="C_SERVICE_MANAGE">政务服务</a>
-                </li>
-                <!--                <li class=" navbar-levelone " data-module="C_SHARING_MANAGE"><a href="#" shiro:hasPermission="C_SHARING_MANAGE">资源共享</a></li>-->
-                <li class=" navbar-levelone " data-module="C_SYSTEM_MANAGE"><a href="#"
-                                                                               shiro:hasPermission="C_SYSTEM_MANAGE">系统管理</a>
-                </li>
-                <li class=" navbar-levelone " data-module="C_INDUSTRIAL_CARRIER"><a
-                        onclick="redirectToIndustrialCarrier()" href="#"
-                        shiro:hasPermission="C_INDUSTRIAL_CARRIER">工业载体</a></li>
-                <li class=" navbar-levelone " data-module="C_ACCOUNT_MANAGE"><a href="#"
-                                                                                shiro:hasPermission="C_ACCOUNT_MANAGE">用户中心</a>
-                </li>
+                <li class=" navbar-levelone " data-module="C_NOTIFY_MANAGE"><a href="#" shiro:hasPermission="C_NOTIFY_MANAGE">消息管理</a></li>
+                <li class=" navbar-levelone " data-module="C_PROPERTY_MANAGE"><a href="#" shiro:hasPermission="C_PROPERTY_MANAGE">物业管理</a></li>
+                <li class=" navbar-levelone " data-module="C_SERVICE_MANAGE"><a href="#" shiro:hasPermission="C_SERVICE_MANAGE">政务服务</a></li>
+                <li class=" navbar-levelone " data-module="C_SHARING_MANAGE"><a href="#" shiro:hasPermission="C_SHARING_MANAGE">资源共享</a></li>
+                <li class=" navbar-levelone " data-module="C_SYSTEM_MANAGE"><a href="#" shiro:hasPermission="C_SYSTEM_MANAGE">系统管理</a></li>
+                <li class=" navbar-levelone " data-module="C_INDUSTRIAL_CARRIER"><a onclick="redirectToIndustrialCarrier()" href="#"
+                                                 shiro:hasPermission="C_INDUSTRIAL_CARRIER">工业载体</a></li>
+                <li class=" navbar-levelone " data-module="C_ACCOUNT_MANAGE"><a href="#" shiro:hasPermission="C_ACCOUNT_MANAGE">用户中心</a></li>
             </ul>
             <ul th:if="${user_type}==4"><!-- 街道 -->
                 <li class=" navbar-levelone " data-module="HOME"><a href="#">首页</a></li>
-                <li class=" navbar-levelone " data-module="S_MESSAGE_MANAGE"><a href="#"
-                                                                                shiro:hasPermission="S_MESSAGE_MANAGE">消息管理</a>
-                </li>
-                <li class=" navbar-levelone " data-module="S_STREET_MANAGE"><a href="#"
-                                                                               shiro:hasPermission="S_STREET_MANAGE">街道管理</a>
-                </li>
-                <li class=" navbar-levelone " data-module="S_SERVICE_MANAGE"><a href="#"
-                                                                                shiro:hasPermission="S_SERVICE_MANAGE">政务服务管理</a>
-                </li>
-                <li class=" navbar-levelone " data-module="S_DATA_MANAGE"><a href="#"
-                                                                             shiro:hasPermission="S_DATA_MANAGE">大数据管理</a>
-                </li>
-                <li class=" navbar-levelone " data-module="S_INDUSTRIAL_CARRIER"><a
-                        onclick="redirectToIndustrialCarrier()" href="#"
-                        shiro:hasPermission="S_INDUSTRIAL_CARRIER">工业载体</a></li>
-                <li class=" navbar-levelone " data-module="S_SYS_MANAGE"><a href="#" shiro:hasPermission="S_SYS_MANAGE">系统管理</a>
-                </li>
+                <li class=" navbar-levelone " data-module="S_MESSAGE_MANAGE"><a href="#" shiro:hasPermission="S_MESSAGE_MANAGE">消息管理</a></li>
+                <li class=" navbar-levelone " data-module="S_STREET_MANAGE"><a href="#" shiro:hasPermission="S_STREET_MANAGE">街道管理</a></li>
+                <li class=" navbar-levelone " data-module="S_SERVICE_MANAGE"><a href="#" shiro:hasPermission="S_SERVICE_MANAGE">政务服务管理</a></li>
+                <li class=" navbar-levelone " data-module="S_DATA_MANAGE"><a href="#" shiro:hasPermission="S_DATA_MANAGE">大数据管理</a></li>
+                <li class=" navbar-levelone " data-module="S_INDUSTRIAL_CARRIER"><a onclick="redirectToIndustrialCarrier()" href="#"
+                                                 shiro:hasPermission="S_INDUSTRIAL_CARRIER">工业载体</a></li>
+                <li class=" navbar-levelone " data-module="S_SYS_MANAGE"><a href="#" shiro:hasPermission="S_SYS_MANAGE">系统管理</a></li>
             </ul>
             <ul th:if="${user_type}==2"><!-- super -->
                 <li class=" navbar-levelone " data-module="S_STREET_MANAGE"><a href="#">街道管理</a></li>
@@ -269,76 +214,13 @@
             // });
         }
 
-        function redirectToEpidemicService() {
-            window.open(pagePath.substring(0, pagePath.lastIndexOf("/")) + '/serviceleague/epidemic/#/infoList');
-        }
-
-        function checkLogin1(e) {
-            $.ajax({
-                url: pagePath + "/home/checkLogin/",
-                type: "get",
-                dataType: "json",
-                data:{
-                    timeStamp: new Date()
-                },
-                success: function (result) {
-                    if (result.success) {
-                        var obj = result.obj;
-                        if (obj.isLogin) {
-                            if(e == 'azw') {
-                                window.open("http://202.102.20.60:8008/xq/#/login?username="+obj.userName)
-                            } else if(e='dljk') {
-                                window.open("http://202.102.20.60:8008/ly/#/login?username="+obj.userName)
-                            } else if(e='lyjj') {
-                                window.open("http://112.4.85.47:8000/lyzf/#/login?username="+obj.userName)
-                            } else if (e == 'jwtz') {
-                                if (obj.userType == 3) {
-                                    window.open('http://112.4.85.50:9300/irsweb/?id=' + loginUserId)
-                                }
-                            } else if(e == 'gycf') {
-                                window.open(pagePath.substring(0,pagePath.lastIndexOf("/")) + '/industry/home/#/home');
-                                $.ajax({
-                                    url: pagePath + "/token/create",
-                                    type: "get",
-                                    dataType: "json",
-                                    data: {
-                                        timeStamp: new Date()
-                                    },
-                                    success: function (result) {
-                                        if (result.success) {
-                                            var token = result.obj;
-                                            localStorage.setItem("INDUSTRIAL_CARRIER", token);
-                                        }
-                                    }
-                                });
-                            }
-                        } else {
-                            location.href = pagePath + "/home/login";
-                            if(e == 'azw') {
-                                localStorage.setItem("safetySupervision", "1");
-                                localStorage.setItem("errorMsg", "用户不存在!");
-                            }
-                            if(e == 'gycf') {
-                                localStorage.setItem("industrialCarrier", "1");
-                            }
-                        }
-                    } else {
-                        errorMessage(result.message);
-                    }
-                },
-                error: function () {
-                    errorMessage('系统错误!');
-                }
-            });
-        }
-
         function clearStorage() {
             localStorage.clear();
         }
     </script>
     <SCRIPT>
         // 这里写代码做页面跳转
-        $(function () {
+        $(function() {
             // 先取一级此单，模拟点击事件
             // 再去左侧菜单，模拟点击事件
             setTimeout(setMenu, 500)
@@ -352,7 +234,7 @@
             // 使第二个头部后菜单选中
             var moduleIndex = getCellIndexFromArray($topMenu, module, 'module')
             // 下标小于0 说明元素不存在
-            if (moduleIndex < 0) return
+            if(moduleIndex < 0 ) return
             $topMenu[moduleIndex].click()
             sleep(100)
             // 头部菜单选中后，在左侧第二个菜单选中
@@ -362,14 +244,14 @@
             // 显示第二个元素
             var $leafMenu = $($leftMenu).find('dl a')
 
-            var menuIndex = getCellIndexFromArray($leafMenu, menu, 'menu')
+            var menuIndex = getCellIndexFromArray($leafMenu, menu,  'menu')
             $leafMenu[menuIndex].click()
 
             // 如果是三级菜单，上一级为li
             // 需要展开二级菜单
-            if ($($leafMenu[menuIndex]).parent().prop('tagName') == 'LI') {
+            if($($leafMenu[menuIndex]).parent().prop('tagName') == 'LI') {
                 var $ddParent = $($leafMenu[menuIndex]).closest('dd')
-                $ddParent.css("display", "block")
+                    $ddParent.css("display", "block")
                 $ddParent.prev().addClass("selected")
             }
         }
@@ -381,11 +263,11 @@
             }
         }
 
-        function getCellIndexFromArray(arr, cellName, dataName) {
-            if (arr.length > 0) {
-                for (var i = 0; i < arr.length; i++) {
+        function getCellIndexFromArray (arr, cellName, dataName) {
+            if(arr.length > 0) {
+                for ( var i = 0 ; i < arr.length; i++) {
                     var cell = arr[i]
-                    if ($(cell).data(dataName) == cellName) {
+                    if($(cell).data(dataName) == cellName) {
                         return i
                     }
                 }
@@ -399,22 +281,21 @@
          * @param variable
          * @returns {string|boolean}
          */
-        function getQueryVariable(variable) {
+        function getQueryVariable(variable)
+        {
             var query = window.location.search.substring(1);
-            if (query == '') {
+            if(query == '') {
                 query = window.location.hash.substring(1);
             }
-            if (query.indexOf("?") > -1) {
+            if(query.indexOf("?")>-1) {
                 query = query.split('?')[1]
             }
             var vars = query.split("&");
-            for (var i = 0; i < vars.length; i++) {
+            for (var i=0;i<vars.length;i++) {
                 var pair = vars[i].split("=");
-                if (pair[0] == variable) {
-                    return pair[1];
-                }
+                if(pair[0] == variable){return pair[1];}
             }
-            return (false);
+            return(false);
         }
     </SCRIPT>
 </div>

src/main/resources/templates/admin/government/activity_detail.html

@@ -62,60 +62,17 @@
         .l {
             padding: 10px 20px;
         }
-
-        .activity-top {
-            border: solid 1px #dadada;
-            padding: 15px;
-        }
-
-        .activity-box {
-            margin-bottom: 10px;
-        }
-
-        .activity-box:last-child {
-            margin-bottom: 0;
-        }
-
-        .activity-box-label {
-            display: block;
-            float: left;
-            width: 80px;
-            padding: 5px 0;
-        }
-
-        .activity-box-list {
-            float: left;
-        }
-
-        .activity-box-list ul {
-            border: solid 1px #dadada;
-        }
-
-        .activity-box-list ul li {
-            float: left;
-            border-right: solid 1px #dadada;
-            padding: 5px 20px;
-            cursor: pointer;
-        }
-
-        .activity-box-list ul li.active {
-            background: #7DB4D8;
-            color: #fff;
-        }
-
-        .activity-box-list ul li:last-child {
-            border-right: 0;
-        }
     </style>
 </head>
 
 <body layout:fragment="content">
+
 <article class="page-container">
     <div class="tabBar cl">
         <span>活动详情</span>
         <span>报名信息</span>
         <span>签到信息</span>
-        <span onclick="setTabFlag(3)">反馈信息</span>
+        <span>反馈信息</span>
     </div>
     <!--活动热度-->
     <div>
@@ -242,7 +199,7 @@
                 <tr class="text-c">
                     <th>单位名称</th>
                     <th width="90">姓名</th>
-                    <th>手机号码</th>
+                    <th>手机</th>
                     <th>邮箱</th>
                     <th>职位</th>
                     <th>报名途径</th>
@@ -256,10 +213,7 @@
                     <td th:text="${m.phone}"></td>
                     <td th:text="${m.mail}"></td>
                     <td th:text="${m.position}"></td>
-                    <!--报名途径-->
-                    <td th:if="${m.registration_way=='0'}">门户</td>
-                    <td th:if="${m.registration_way=='1'}">微信</td>
-                    <!--报名途径-->
+                    <td>门户</td>
                     <td th:if="${m.review_state=='0'}">待审核</td>
                     <td th:if="${m.review_state=='1'}">通过</td>
                     <td th:if="${m.review_state=='2'}">驳回</td>
@@ -271,7 +225,7 @@
                 <div style="text-align: center">
                     <!--<a th:onclick="'javascript:print(\'打印\',\'/government/activity/printReg/'+${activity.id}+'\');'"
                        class="btn btn-secondary radius" type="button">打印全部</a>-->
-                    <a th:onclick="'javascript:exportExcelRegistration(\''+${activity.id}+'\');'"
+                    <a th:onclick="'javascript:exportExcel(\''+${activity.id}+'\');'"
                        class="btn btn-secondary radius" type="button">下载</a>
                     <a onclick="removeIframe();" class="btn btn-default radius" type="button">返回</a>
                 </div>
@@ -286,341 +240,59 @@
                 <tr class="text-c">
                     <th>单位名称</th>
                     <th width="90">姓名</th>
-                    <th>职位</th>
-                    <th>手机号码</th>
-                    <th>报名时间</th>
                     <th>签到信息</th>
                     <th>签到时间</th>
                 </tr>
                 </thead>
                 <tbody>
                 <tr class="text-c" th:each="m,iterStat:${signList}">
-                    <!--单位名称-->
                     <td th:text="${m.user_name}"></td>
-                    <!--姓名-->
                     <td th:text="${m.name}"></td>
-                    <!--职位-->
-                    <td th:text="${m.position}"></td>
-                    <!--手机号码-->
-                    <td th:text="${m.phone}"></td>
-                    <!--报名时间-->
-                    <td th:text="${#dates.format(m.registration_time, 'yyyy-MM-dd HH:mm:ss')}"></td>
-                    <!--签到信息-->
                     <td th:if="${m.sign_state=='' || m.sign_state==null}">待确认</td>
                     <td th:if="${m.sign_state=='0'}">已签到</td>
                     <td th:if="${m.sign_state=='1'}">未参加</td>
-                    <!--签到时间-->
-                    <td th:text="${#dates.format(m.sign_time, 'yyyy-MM-dd HH:mm:ss')}"></td>
+                    <td th:text="${#dates.format(m.registration_time, 'yyyy-MM-dd HH:mm:ss')}"></td>
                 </tr>
                 </tbody>
             </table>
-            <div class="row cl" style="padding-top: 10px">
-                <div style="text-align: center">
-                    <a th:onclick="'javascript:exportExcelSign(\''+${activity.id}+'\');'"
-                       class="btn btn-secondary radius" type="button">下载</a>
+            <div class="row cl" style="text-align: center">
+                <div class="col-xs-8 col-sm-9 col-xs-offset-4 col-sm-offset-2">
                     <a onclick="removeIframe();" class="btn btn-default radius" type="button">返回</a>
                 </div>
             </div>
         </div>
         <!--反馈信息-->
         <div class="tabCon">
-
-            <form id="myForm" th:action="@{/government/activity/get/{activity_id}(activity_id=${activity_id})}"
-                  th:method="get">
-
-                <div class="activity-top">
-                    <div class="clearfix activity-box">
-                        <span class="activity-box-label">综合评分:</span>
-                        <div class="activity-box-list">
-                            <ul class="clearfix" id="feedback_type">
-                                <li th:class="${maxScore=='101'&&minScore=='-1'}? 'active' : ''">
-                                    <input hidden name="maxScore" type="radio" th:checked="${maxScore=='101'}"
-                                           value="101">
-                                    <input hidden name="minScore" type="radio" th:checked="${minScore=='-1'}"
-                                           value="-1">
-                                    <span>全部</span>
-                                    <span th:text="${'('+scoreCount.score_all+')'}">(0)</span>
-                                </li>
-                                <li th:class="${maxScore=='100'&&minScore=='80'}? 'active' : ''">
-                                    <input hidden name="maxScore" type="radio" th:checked="${maxScore=='100'}"
-                                           value="100">
-                                    <input hidden name="minScore" type="radio" th:checked="${minScore=='80'}"
-                                           value="80">
-                                    <span>100-80</span>
-                                    <span th:text="${'('+scoreCount.score100_80+')'}">(0)</span>
-                                </li>
-                                <li th:class="${maxScore=='80'&&minScore=='60'}? 'active' : ''">
-                                    <input hidden name="maxScore" type="radio" th:checked="${maxScore=='80'}"
-                                           value="80">
-                                    <input hidden name="minScore" type="radio" th:checked="${minScore=='60'}"
-                                           value="60">
-                                    <span>80-60</span>
-                                    <span th:text="${'('+scoreCount.score80_60+')'}">(0)</span>
-                                </li>
-                                <li th:class="${maxScore=='60'&&minScore=='40'}? 'active' : ''">
-                                    <input hidden name="maxScore" type="radio" th:checked="${maxScore=='60'}"
-                                           value="60">
-                                    <input hidden name="minScore" type="radio" th:checked="${minScore=='40'}"
-                                           value="40">
-                                    <span>60-40</span>
-                                    <span th:text="${'('+scoreCount.score60_40+')'}">(0)</span>
-                                </li>
-                                <li th:class="${maxScore=='40'&&minScore=='20'}? 'active' : ''">
-                                    <input hidden name="maxScore" type="radio" th:checked="${maxScore=='40'}"
-                                           value="40">
-                                    <input hidden name="minScore" type="radio" th:checked="${minScore=='20'}"
-                                           value="20">
-                                    <span>40-20</span>
-                                    <span th:text="${'('+scoreCount.score40_20+')'}">(0)</span>
-                                </li>
-                                <li th:class="${maxScore=='20'&&minScore=='-2'}? 'active' : ''">
-                                    <input hidden name="maxScore" type="radio" th:checked="${maxScore=='20'}"
-                                           value="20">
-                                    <input hidden name="minScore" type="radio" th:checked="${minScore=='-2'}"
-                                           value="-2">
-                                    <span>20-0</span>
-                                    <span th:text="${'('+scoreCount.score20_0+')'}">(0)</span>
-                                </li>
-                            </ul>
-                        </div>
-                    </div>
+            <div class="row cl">
+                <div class="formControls col-xs-12 col-sm-12">
+                    <ul class="formControls_ul" th:each="m,iterStat:${feedbackList}">
+                        <li>
+                            <p th:text="${m.content}"></p>
+                            <p class="formControls_p"><span>用户昵称：[[${m.create_name}]]</span><span
+                                    th:text="${#dates.format(m.feedback_time, 'yyyy年MM月dd日')}"></span></p>
+                        </li>
+                    </ul>
                 </div>
-                <div class="page-container">
-                    <div class="cl pd-5 bg-1 bk-gray mt-20">
-                        <span class="l">
-                        </span>
-                        <span class="r">共有数据：<strong th:text="${pageInfo?.total}" id="total">0</strong> 条</span>
-                    </div>
-                    <table class="table table-border table-bordered table-bg table-hover"
-                           style="table-layout: fixed;width:100%;">
-                        <thead>
-                        <tr class="text-c">
-                            <th width="60">用户姓名</th>
-                            <th width="100">反馈时间</th>
-                            <th>活动评价</th>
-                            <th width="60">综合评分</th>
-                            <th>反馈及建议</th>
-                            <th>回复内容</th>
-                            <th width="60">反馈类型</th>
-                            <th width="60">是否显示</th>
-                            <th width="120">操作</th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <tr class="text-c" th:each="m,iterStat:${pageInfo.list}">
-                            <!-- 用户姓名 -->
-                            <td th:text="${m.feedback_name}"></td>
-                            <!-- 反馈时间 -->
-                            <td>
-                                <p th:text="${#dates.format(m.feedback_time,'yyyy年MM月dd日')}"></p>
-                                <p th:text="${#dates.format(m.feedback_time,'HH:mm:ss')}"></p>
-                            </td>
-                            <!-- 活动评价 -->
-                            <td>
-                                <p>内容设计(20分)
-                                    <i th:if="${m.score_1 > 0}">
-                                        <i th:each="i:${#numbers.sequence(1,m.score_1)}" class="ifont-xing"
-                                           style="color:#FFD700"></i>
-                                    </i>
-                                    <i th:if="${m.score_1 < 5}">
-                                        <i th:each="i:${#numbers.sequence(m.score_1,4)}" class="ifont-star"
-                                           style="color:#DCDCDC"></i>
-                                    </i>
-                                </p>
-                                <p>讲师水平(20分)
-                                    <i th:if="${m.score_2 > 0}">
-                                        <i th:each="i:${#numbers.sequence(1,m.score_2)}" class="ifont-xing"
-                                           style="color:#FFD700"></i>
-                                    </i>
-                                    <i th:if="${m.score_2 < 5}">
-                                        <i th:each="i:${#numbers.sequence(m.score_2,4)}" class="ifont-star"
-                                           style="color:#DCDCDC"></i>
-                                    </i>
-                                </p>
-                                <p>活动效果(60分)
-                                    <i th:if="${m.score_3 > 0}">
-                                        <i th:each="i:${#numbers.sequence(1,m.score_3)}" class="ifont-xing"
-                                           style="color:#FFD700"></i>
-                                    </i>
-                                    <i th:if="${m.score_3 < 5}">
-                                        <i th:each="i:${#numbers.sequence(m.score_3,4)}" class="ifont-star"
-                                           style="color:#DCDCDC"></i>
-                                    </i>
-                                </p>
-                            </td>
-                            <!-- 综合评分 -->
-                            <td th:text="${m.score}"></td>
-                            <!-- 反馈及建议 -->
-                            <td th:text="${m.content}"></td>
-                            <!-- 回复内容 -->
-                            <td th:id="'reply_'+${m.id}" th:text="${m.reply}"></td>
-                            <!-- 反馈类型 -->
-                            <td th:if="${m.is_public==true}">公开</td>
-                            <td th:if="${m.is_public==false}">不公开</td>
-                            <!-- 是否显示 -->
-                            <!-- <td th:text="${m.is_view}"></td> -->
-                            <td th:if="${m.is_view==true}">显示</td>
-                            <td th:if="${m.is_view==false}">不显示</td>
-                            <!-- 操作 -->
-                            <td>
-                                <a class="ml-5" style="color: rgb(14, 144, 210);"
-                                   th:if="${m.is_top==false &&  m.is_public==true}"
-                                   th:onclick="'javascript:top_feedback('+${m.id}+')'">
-                                    置顶
-                                </a>
-                                <i class="ml-5" style="font-style:normal"
-                                   th:if="${m.is_top==false && m.is_public==false}">
-                                    置顶
-                                </i>
-                                <i class="ml-5" style="font-style:normal"
-                                   th:if="${m.is_top==true}">
-                                    已置顶
-                                </i>
-                                <a class="ml-5" style="color: rgb(14, 144, 210);"
-                                   th:if="${m.is_view==false}" th:onclick="'javascript:show_feedback('+${m.id}+')'">
-                                    显示
-                                </a>
-                                <a class="ml-5" style="color: rgb(14, 144, 210);"
-                                   th:if="${m.is_view==true}" th:onclick="'javascript:display_feedback('+${m.id}+')'">
-                                    不显示
-                                </a>
-                                <a class="ml-5" style="color: rgb(14, 144, 210);"
-                                   th:onclick="'javascript:reply_dialog(\'回复\',\'/government/activity/reply/'+${m.id}+'\',\'800\',\'500\');'">回复</a>
-                            </td>
-                        </tr>
-                        </tbody>
-                    </table>
-                    <div th:replace="admin/common/page :: page"></div>
+            </div>
+            <div class="row cl" style="text-align: center">
+                <div class="col-xs-8 col-sm-9 col-xs-offset-4 col-sm-offset-2">
+                    <a onclick="removeIframe();" class="btn btn-default radius" type="button">返回</a>
                 </div>
-            </form>
+            </div>
         </div>
     </div>
 </article>
-<script type="text/javascript" th:src="@{/js/common/page.js}"></script>
 <script th:inline="javascript">
-
-    $(function () {
-        $(".activity-box-list ul li").on("click", function () {
-            if ($(this).hasClass("active")) {
-                $(this).removeClass("active")
-            } else {
-                $(this).addClass("active").siblings().removeClass("active")
-            }
-        });
-    });
-
-    $("ul#feedback_type").on("click", "li", function () {
-        maxScore = $(this).children("input").eq(0).val();
-        minScore = $(this).children("input").eq(1).val();
-
-        $('input:radio[name="maxScore"]').removeAttr('checked');
-        $('input:radio[name="minScore"]').removeAttr('checked');
-
-        $(this).children("input").eq(0).attr('checked', true);
-        $(this).children("input").eq(1).attr('checked', true);
-
-        url = pagePath + "/government/activity/get/" + [[${activity_id}]] + "?minScore=" + minScore + "&maxScore=" + maxScore;
-        location.replace(url);
-    });
-
     // tab切换
-    tabChange_custom(".tabBar", ".tabCon");
-
-    function tabChange_custom(tabMenu, tabContent) {
-
-        var tabIndex = 0;
-        if (sessionStorage.getItem("tabIndex") != undefined && sessionStorage.getItem("tabIndex") != null) {
-            tabIndex = sessionStorage.getItem("tabIndex")
-        }
-        var $tab = $(tabMenu);
-        $tab.find("span").eq(tabIndex).addClass("current");
-        $(tabContent).eq(tabIndex).show();
-        $tab.find("span").on("click", function () {
-            var index = $(this).index();
-            $(this).addClass("current").siblings().removeClass("current");
-            $(tabContent).eq(index).show().siblings().hide();
-        })
-    }
-
-    function setTabFlag(index) {
-        sessionStorage.setItem("tabIndex", index);
-    }
+    tabChange(".tabBar", ".tabCon");
 
     function print(title, url, w, h) {
         var index = layer_show(title, pagePath + url, w, h);
         layer.full(index);
     }
 
-    function exportExcelRegistration(id) {
-        window.open(pagePath + "/government/activity/exportExcelRegistration?id=" + id);
-    }
-
-    function exportExcelSign(id) {
-        window.open(pagePath + "/government/activity/exportExcelSign?id=" + id);
-    }
-
-    function reply_dialog(title, url, w, h) {
-        var index = layer_show(title, pagePath + url, w, h);
-    }
-
-    function show_feedback(feedback_id) {
-        $.ajax({
-            type: 'put',
-            url: pagePath + "/activity/comment/feedback",
-            dataType: "json",
-            data: {
-                id: feedback_id,
-                is_view: true
-            },
-            success: function (data) {
-                smileMessage('操作成功!')
-                setTime();
-            },
-            error: function () {
-                errorMessage('系统错误!');
-            }
-        });
-    }
-
-    function display_feedback(feedback_id) {
-        $.ajax({
-            type: 'put',
-            url: pagePath + "/activity/comment/feedback",
-            dataType: "json",
-            data: {
-                id: feedback_id,
-                is_view: false
-            },
-            success: function (data) {
-                smileMessage('操作成功!')
-                setTime();
-            },
-            error: function () {
-                errorMessage('系统错误!');
-            }
-        });
-    }
-
-    function top_feedback(feedback_id) {
-        layer.confirm('确定置顶此条反馈内容吗？', function () {
-            //此处请求后台程序，下方是成功后的前台处理……
-            $.ajax({
-                type: 'put',
-                url: pagePath + "/activity/comment/feedback",
-                dataType: "json",
-                data: {
-                    id: feedback_id,
-                    is_top: true
-                },
-                success: function (data) {
-                    smileMessage('操作成功!')
-                    setTime();
-                },
-                error: function () {
-                    errorMessage('系统错误!');
-                }
-            });
-        });
+    function exportExcel(id) {
+        window.open(pagePath + "/government/activity/exportExcel?id=" + id);
     }
 
     /**

src/main/resources/templates/admin/home.html

@@ -997,7 +997,7 @@
                     }
                 },
                 title: {
-                    text: '2019年街道申报项目数'
+                    text: '2018年街道申报项目数'
                 },
 
                 subtitle: {

src/main/resources/templates/home/common/common.html

@@ -53,30 +53,12 @@
     <![endif]-->
 
     <script type="text/javascript">
-        loginUserName = localStorage.getItem('user_name')
-        loginUserId = localStorage.getItem('user_id')
-        $(function () {
-            if (loginUserName) {
-                // document.getElementsByClassName('.loginIcon')[0].src = loginUserName;
-                document.getElementsByClassName('loginName')[0].innerText = loginUserName;
-                document.getElementById('login-link').style.display = 'none'
-            } else {
-                document.getElementsByClassName('toAdmin')[0].style.display = 'none'
-                document.getElementsByClassName('loginIcon')[0].style.display = 'none'
-                document.getElementsByClassName('dropMenu')[0].style.display = 'none'
-            }
-        });
         $(function () {
             if ($("#showtime").length > 0) {
                 showDT();
             }
         });
 
-        function logOut() {
-            localStorage.clear()
-            window.location.href = 'http://' + window.location.host +  '/admin/logout'
-        }
-
         function showDT() {
             var days = new Array("日", "一", "二", "三", "四", "五", "六");
             var currentDT = new Date();
@@ -119,6 +101,15 @@
         function toIndustrial() {
             window.open(pagePath.substring(0,pagePath.lastIndexOf("/")) + '/industry/home/#/industrialReserve');
         }
+
+        function toIndustrialHome() {
+            window.open(pagePath.substring(0,pagePath.lastIndexOf("/")) + '/industry/home/#/home');
+        }
+
+        function toIndustrialMap() {
+            window.open(pagePath.substring(0,pagePath.lastIndexOf("/")) + '/industry/home/#/industrialReserve');
+        }
+
         function checkLogin1(e) {
             $.ajax({
                 url: pagePath + "/home/checkLogin/",
@@ -131,17 +122,10 @@
                     if (result.success) {
                         var obj = result.obj;
                         if (obj.isLogin) {
-                            if(e == 'azw') {
-                                window.open("http://202.102.20.60:8008/xq/#/login?username="+obj.userName)
-                            } else if(e='dljk') {
-                                window.open("http://202.102.20.60:8008/ly/#/login?username="+obj.userName)
-                            } else if(e='lyjj') {
-                                window.open("http://112.4.85.47:8000/lyzf/#/login?username="+obj.userName)
-                            } else if (e == 'jwtz') {
-                                if (obj.userType == 3) {
-                                    window.open('http://112.4.85.50:9300/irsweb/?id=' + loginUserId)
-                                }
-                            } else if(e == 'gycf') {
+                            if(e === 'azw') {
+                                window.location.href="http://202.102.20.60:8008/xq/#/login?username="+obj.userName;
+                            }
+                            if(e === 'gycf') {
                                 // window.location.href = pagePath.substring(0,pagePath.lastIndexOf("/")) + '/industry/home';
                                 window.open(pagePath.substring(0,pagePath.lastIndexOf("/")) + '/industry/home/#/home');
                                 $.ajax({
@@ -159,6 +143,23 @@
                                     }
                                 });
                             }
+                            if (e === 'gytd'){
+                                window.open(pagePath.substring(0,pagePath.lastIndexOf("/")) + '/industry/home/#/industrialReserve');
+                                $.ajax({
+                                    url: pagePath + "/token/create",
+                                    type: "get",
+                                    dataType: "json",
+                                    data: {
+                                        timeStamp: new Date()
+                                    },
+                                    success: function (result) {
+                                        if (result.success) {
+                                            var token = result.obj;
+                                            localStorage.setItem("INDUSTRIAL_CARRIER", token);
+                                        }
+                                    }
+                                });
+                            }
                         } else {
                             //errorMessage("请登陆！");
                             location.href = pagePath + "/home/login";
@@ -172,6 +173,9 @@
                             if(e == 'gycf') {
                                 localStorage.setItem("industrialCarrier", "1");
                             }
+                            if(e == 'gytd') {
+                                localStorage.setItem("industrialLand", "1");
+                            }
                         }
                     } else {
                         errorMessage(result.message);
@@ -182,127 +186,6 @@
                 }
             });
         }
-        function checkTel (tel) {
-            var telObj = {}
-            if (/^1(3|4|5|7|8)\d{9}$/.test(tel)) {
-                telObj.type = '移动电话'
-                telObj.typeNumber = 1
-                telObj.isPass = true
-            } else if (/^0\d{2,3}-?\d{7,8}$/.test(tel)) {
-                telObj.type = '固定电话'
-                telObj.typeNumber = 2
-                telObj.isPass = true
-            } else {
-                telObj.type = '不是有效的电话号码！'
-                telObj.typeNumber = 0
-                telObj.isPass = false
-            }
-            return telObj
-        }
-        function checkEmail (email) {
-            return (/^[A-Za-z\d]+([-_.][A-Za-z\d]+)*@([A-Za-z\d]+[-.])+[A-Za-z\d]{2,5}$/.test(email))
-        }
-        function changeContact() {
-            var contractValue = $(".feedback_right input[dataValue='contact']").val()
-            if (contractValue == '') {
-                $(".feedback_right input[dataValue='contact']").addClass("is_error")
-                $(".feedback_error[dataValue='contact']").text('请输入联系人')
-                return false
-            } else if (contractValue.length >10 || contractValue.length < 2) {
-                $(".feedback_right input[dataValue='contact']").addClass("is_error")
-                $(".feedback_error[dataValue='contact']").text('长度在2-10个字符')
-                return false
-            } else {
-                $(".feedback_right input[dataValue='contact']").removeClass("is_error")
-                $(".feedback_error[dataValue='contact']").text('')
-                return true
-            }
-        }
-        function changeTel() {
-            var teltValue = $(".feedback_right input[dataValue='tel']").val()
-            if (teltValue == '') {
-                $(".feedback_right input[dataValue='tel']").addClass("is_error")
-                $(".feedback_error[dataValue='tel']").text('请输入电话')
-                return false
-            } else {
-                var checkTelObj = checkTel(teltValue)
-                if (!checkTelObj.isPass) {
-                    $(".feedback_right input[dataValue='tel']").addClass("is_error")
-                    $(".feedback_error[dataValue='tel']").text(checkTelObj.type)
-                    return false
-                } else {
-                    $(".feedback_right input[dataValue='tel']").removeClass("is_error")
-                    $(".feedback_error[dataValue='tel']").text('')
-                    return true
-                }
-            }
-        }
-        function changeEmail() {
-            var emailValue = $(".feedback_right input[dataValue='email']").val()
-            if (emailValue == '') {
-                $(".feedback_right input[dataValue='email']").addClass("is_error")
-                $(".feedback_error[dataValue='email']").text('请输入邮箱')
-                return false
-            } else {
-                var checkEmailObj = checkEmail(emailValue)
-                if (!checkEmailObj) {
-                    $(".feedback_right input[dataValue='email']").addClass("is_error")
-                    $(".feedback_error[dataValue='email']").text('请输入正确的邮箱地址')
-                    return false
-                } else {
-                    $(".feedback_right input[dataValue='email']").removeClass("is_error")
-                    $(".feedback_error[dataValue='email']").text('')
-                    return true
-                }
-            }
-        }
-        function changeContent() {
-            var contentValue = $(".feedback_right textarea[dataValue='content']").val()
-            if (contentValue == '') {
-                $(".feedback_right textarea[dataValue='content']").addClass("is_error")
-                $(".feedback_error[dataValue='content']").text('请输入反馈内容')
-                return false
-            } else if (contentValue.length > 500 || contentValue.length < 5) {
-                $(".feedback_right textarea[dataValue='content']").addClass("is_error")
-                $(".feedback_error[dataValue='content']").text('长度在5-500个字符')
-                return false
-            } else {
-                $(".feedback_right textarea[dataValue='content']").removeClass("is_error")
-                $(".feedback_error[dataValue='content']").text('')
-                return true
-            }
-        }
-        function feedbackCancel() {
-            $(".tips-popup").hide();
-        }
-        function feedbackSubmit() {
-            changeContact()
-            changeTel()
-            changeEmail()
-            changeContent()
-            var submitResult = changeContact() && changeTel() && changeEmail() && changeContent()
-            if (submitResult) {
-                $.ajax({
-                    url: 'http://' +  window.location.host+ '/api/serviceleague/f/v1/feedback',
-                    type: "post",
-                    dataType: "json",
-                    data:{
-                        "applyContent": $(".feedback_right textarea[dataValue='content']").val(),
-                        "applyEmail": $(".feedback_right input[dataValue='email']").val(),
-                        "applyName": $(".feedback_right input[dataValue='contact']").val(),
-                        "applyCompany": $(".feedback_right input[dataValue='company']").val(),
-                        "applyPhone": $(".feedback_right input[dataValue='tel']").val(),
-                    },
-                    success: function (result) {
-                        succeedMessage('反馈成功')
-                        $(".tips-popup").hide();
-                    },
-                    error: function () {
-                        errorMessage('反馈失败')
-                    }
-                });
-            }
-        }
     </script>
 </head>
 <body>

src/main/resources/templates/home/common/footer.html

@@ -43,65 +43,53 @@
 <!--</div>-->
 <div class="footer" th:fragment="footer">
     <div class="home-content">
-        <div class="footer-left">
+        <div class="clearfix">
             <div class="pull-left link">
                 <p class="clearfix">
-                    <span class="link-title friendlyLink">友情链接</span>
+                    <span class="link-line"></span>
+                    <span class="link-title">友情链接</span>
                 </p>
-                <div>
-                    <a href="http://www.miit.gov.cn/" target="_blank">中华人民共和国工业和信息化部</a><br/>
-                    <a href="http://sme.miit.gov.cn/" target="_blank">中国中小企业信息网</a><br/>
-                    <a href="http://gxt.jiangsu.gov.cn/" target="_blank">江苏省工业和信息化厅</a><br/>
-                    <a href="http://www.szeic.gov.cn/" target="_blank">苏州市工业和信息化局</a><br/>
-                    <a href="http://www.snd.gov.cn/snd/" target="_blank">苏州高新区管委会</a>
-                </div>
+                <ul>
+                    <li th:each="model:${friendLinks}" th:object="${model}"><a th:href="@{*{link_location}}"
+                                                                               th:text="*{name}"></a></li>
+                </ul>
             </div>
-            <div class="pull-left link">
-                <p class="clearfix">
-                    <span class="link-title helpLink">帮助</span>
-                </p>
-                <div>
-                    <a class="help-item" checkData="feedback">诉求反馈</a><br/>
-                    <!--<a class="help-item" checkData="complaints">我要投诉</a><br/>-->
-                    <a class="help-item" checkData="appcode">APP下载</a><br/>
-                    <!--<a class="help-item" checkData="files">文件资料</a>-->
+            <div class="pull-right cord-box clearfix">
+                <div class="pull-left cord-left">
+                    <p class="ft-18">关注微信公众号</p>
+                    <p class="cord-line-box">
+                        <span class="cord-samll-name">获取最新服务资讯</span>
+                    </p>
+                </div>
+                <div class="pull-left cord-list clearfix">
+                    <div class="clearfix ewm-box" style="width:150px;">
+                        <img th:src="@{/home/image/cord-w.jpg}" class="cord-img pull-left">
+                        <div style="width: 18px; float: left">苏<br>州<br>高<br>新<br>区</div>
+                        <div style="width: 18px; float: left">中<br>小<br>企<br>业<br>服</div>
+                        <div style="width: 18px; float: left">务<br>中<br>心</div>
+                    </div>
+                    <div class="clearfix ewm-box">
+                        <img th:src="@{/home/image/cord-fgj.jpg}" class="cord-img pull-left">经发委二维码
+                    </div>
                 </div>
             </div>
         </div>
-        <div class="footer-right">
+
+        <div class="copy-box">
             <div>
-                <img th:src="@{/home/image/xchx.jpg}" class="cord-img">
-                <p>苏州高新区中小企业服务中心</p>
-            </div>
-            <div style="margin-left: 40px;">
-                <img th:src="@{/home/image/cord-fgj.jpg}" class="cord-img">
-                <p>苏州高新区经济发展委员会</p>
+                <p>建设单位：苏州高新区经济发展委员会</p>
+                <p>&copy2019版权所有</p>
+                <p>&nbsp</p>
             </div>
-            <div style="margin-left: 40px;">
-                <img th:src="@{/home/image/cord-w.jpg}" class="cord-img">
-                <p>苏州高新区中小企业服务中心</p>
+            <div class="fangwen">
+                <img th:src="@{/home/image/statistics.png}">
+                <div id="statistics">访问量：0 注册企业数：0 活跃度：0</div>
+                <div>
+                    <script type="text/javascript">var cnzz_protocol = (("https:" == document.location.protocol) ? "https://" : "http://");document.write(unescape("%3Cspan id='cnzz_stat_icon_1276885018'%3E%3C/span%3E%3Cscript src='" + cnzz_protocol + "s96.cnzz.com/z_stat.php%3Fid%3D1276885018%26show%3Dpic1' type='text/javascript'%3E%3C/script%3E"));</script>
+                </div>
             </div>
         </div>
     </div>
-    <div class="copy-box">
-        <div>
-            <p>建设单位：苏州高新区经济发展委员会&copy2019版权所有</p>
-        </div>
-        <!--<div class="fangwen">-->
-        <!--<img th:src="@{/home/image/statistics.png}">-->
-        <!--<div id="statistics">访问量：0 注册企业数：0 活跃度：0</div>-->
-        <!--<div>-->
-        <!--<script type="text/javascript">var cnzz_protocol = (("https:" == document.location.protocol) ? "https://" : "http://");document.write(unescape("%3Cspan id='cnzz_stat_icon_1276885018'%3E%3C/span%3E%3Cscript src='" + cnzz_protocol + "s96.cnzz.com/z_stat.php%3Fid%3D1276885018%26show%3Dpic1' type='text/javascript'%3E%3C/script%3E"));</script>-->
-        <!--</div>-->
-        <!--</div>-->
-    </div>
-    <div class="tips-popup">
-        <div class="tips-content">
-            <span class="tipstitle"></span>
-            <span class="tipsclose">×</span>
-            <div id="popupCentent">敬请期待……</div>
-        </div>
-    </div>
     <script>
 
         var pagePath = $("meta[name='_ctx']").attr("content");
@@ -172,54 +160,9 @@
                 }
             });
         }
-        $(".help-item").on("click", function () {
-            var dataVal = $(this).attr('checkData');
-            $(".tips-content").removeClass("appCodestyle")
-            $(".tips-popup").show();
-            if(dataVal == 'feedback') {
-                $(".tips-content").css({"width": "800px"})
-                $(".tips-content .tipstitle").text('')
-                $("#popupCentent").html('<div class="feedback-left"><div class="feedback-title">诉求反馈</div><div class="feedback-form">' +
-                    '<div class="feedback-single"><span><span style="color:red;margin-right: 4px;">*</span>联系人：</span><div class="feedback-input"><div class="feedback_right"><input type="text" dataValue="contact" oninput="changeContact()" placeholder="请输入联系人"></div><div  dataValue="contact" class="feedback_error"></div></div></div>' +
-                    '<div class="feedback-single"><span><span style="color:red;margin-right: 4px;">*</span>电话：</span><div class="feedback-input"><div class="feedback_right"><input type="text" dataValue="tel" oninput="changeTel()" placeholder="请输入电话"></div><div class="feedback_error" dataValue="tel"></div></div></div>' +
-                    '<div class="feedback-single"><span><span style="color:red;margin-right: 4px;">*</span>邮箱：</span><div class="feedback-input"><div class="feedback_right"><input type="text" dataValue="email" oninput="changeEmail()" placeholder="请输入邮箱"></div><div class="feedback_error" dataValue="email"></div></div></div>' +
-                    '<div class="feedback-single"><span><span style="color:red;margin-right: 4px;"></span>企业名称：</span><div class="feedback-input"><div class="feedback_right"><input type="text" dataValue="company" placeholder="请输入企业名称"></div><div class="feedback_error" dataValue="company"></div></div></div>' +
-                    '<div class="feedback-single"><span><span style="color:red;margin-right: 4px;">*</span>反馈内容：</span><div class="feedback-input"><div class="feedback_right"><textarea type="text" dataValue="content" oninput="changeContent()" placeholder="请输入反馈内容"></textarea></div><div class="feedback_error" dataValue="content"></div></div></div>' +
-                    '</div><div class="feedback-button"><span><button class="feedback_default" onclick="feedbackCancel()">取消</button><button style="margin-left: 10px;" class="feedback_default feedback_confirm" onClick="feedbackSubmit()">确定</button></span></div></div>' +
-                    '<div class="feedback-right"><div class="feedback-title">联系方式</div><div class="feedback-right-text"><p class="contact-way"><span>服务热线：</span><span>0512-68755800</span></p>' +
-                    '<p class="contact-way"><span>投诉电话：</span><span>0512-68755225</span></p><p class="contact-way"><span>投诉邮箱：</span><span>qyfwzx@snd.gov.cn</span></p></div></div>')
-            }
-            else if(dataVal == 'complaints') {
-                $("#popupCentent").html('<div class="popupInfo"><p>投诉邮箱：qyfwzx@snd.gov.cn</p><p>投诉电话：0512-68755225</p></div>')
-            }
-            else if(dataVal == 'appcode') {
-                $(".tips-content").css({"width": "400px"})
-                $(".tips-content .tipstitle").text('')
-                $("#popupCentent").html('<div class="app-code clearfix">\n' +
-                    '                        <div class="app-code-box">\n' +
-                    '                            <img src="'+pagePath+'/home/image/appCode.png">\n' +
-                    '                            <p>安卓版</p>\n' +
-                    '                        </div>\n' +
-                    '                        <div class="app-code-box">\n' +
-                    '                            <img src="'+pagePath+'/home/image/ios.png">\n' +
-                    '                            <p>ios版</p>\n' +
-                    '                        </div>\n' +
-                    '                    </div>')
-                $(".tips-content").addClass("appCodestyle")
-            }
-            else if(dataVal == 'files') {
-                $("#popupCentent").html('<div class="popupInfo"><p style="text-align: center; font-size: 20px; color: #ff0000;margin-top: -50px; margin-bottom: 10px;">文件下载</p><p><a href="'+pagePath+'/home/image/园区工业载体使用说明.docx" style="display: block; width: 100%"><span style=" float: left">园区工业载体使用说明.docx</span><span style="float: right; color: #dd0000">↓下载</span></a></p><p><a href="'+pagePath+'/home/image/属地工业载体使用说明.docx" style="display: block; width: 100%"><span style=" float: left">属地工业载体使用说明.docx</span><span style="float: right; color: #dd0000"">↓下载</span></a></p><p><a href="'+pagePath+'/home/image/政府工业载体使用说明.docx" style="display: block; width: 100%"><span style=" float: left">政府工业载体使用说明.docx</span><span style="float: right; color: #dd0000"">↓下载</span></a></p></div>')
-            }
-            else {
-                $("#popupCentent").html('敬请期待……')
-            }
-        });
-        $(".tipsclose").on("click", function () {
-            $(".tips-popup").hide();
-        });
     </script>
     <!--右侧悬浮目录-->
-    <!--<script th:src="@{/home/plugin/rightMenu.js}" type="text/javascript"></script>-->
+    <script th:src="@{/home/plugin/rightMenu.js}" type="text/javascript"></script>
 </div>
 </body>
 

src/main/resources/templates/home/common/header.html

@@ -94,8 +94,9 @@
 					<li role="presentation" class="relative">
 						<a data-title="工业载体">工业载体</a>
 						<div class="second-menu">
-							<a onclick="checkLogin1('gycf')" data-title="工业厂房">工业厂房</a>
-							<a onclick="toIndustrial()" data-title="工业土地">工业土地</a>
+							<!--<a onclick="checkLogin1('gycf')" data-title="工业厂房">工业厂房</a>-->
+							<a onclick="toIndustrialHome()" data-title="工业厂房">工业厂房</a>
+							<a onclick="toIndustrialMap()" data-title="工业土地">工业土地</a>
 						</div>
 					</li>
 					<li role="presentation" class="relative">

src/main/resources/templates/home/html/contents.html

@@ -309,9 +309,9 @@
                         str += '<p><i class="iconfont">&#xe62d;</i> ' + newList[i].activity_starttime.substring(0, 4) + '年' + newList[i].activity_starttime.substring(5, 7) + '月' + newList[i].activity_starttime.substring(8, 10) + '日' + newList[i].activity_starttime.substring(10, 16) + '</p>'
                         str += '<p><i class="iconfont">&#xe6e5;</i> ' + newList[i].activity_location + '</p>'
                         str += '<div>'
-                        if (newList[i].activity_deadline == '0') {
+                        if (newList[i].can_sign_up === true) {
                             str += '<a href="' + pagePath + '/home/activityDetail/' + newList[i].id + '" class="btn btn-success radius" onclick="" target="_blank">参与报名</a>'
-                        } else if (newList[i].activity_deadline == '1') {
+                        } else if (newList[i].can_sign_up === false) {
                             str += '<a href="' + pagePath + '/home/activityDetail/' + newList[i].id + '" class="btn btn-success radius" onclick="" target="_blank">活动详情</a>'
                         }
 

src/test/java/com/test2.java

@@ -38,7 +38,7 @@ public class test2 {
     public static final String DEFAULT_PUBLIC_KEY_STRING = "MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKHGwq7q2RmwuRgKxBypQHw0mYu4BQZ3eMsTrdK8E6igRcxsobUC7uT0SoxIjl1WveWniCASejoQtn/BY6hVKWsCAwEAAQ==";
 
     public static void main(String[] args) throws Exception {
-        String password = "123456";
+        String password = "root";
         String[] arr = genKeyPair(512);
         System.out.println("privateKey:" + arr[0]);
         System.out.println("publicKey:" + arr[1]);