Merge branch 'master' of http://nonxin.cn:8090/r/product/product-server-mob...

shichongfu

2023-08-21 05c24636a83d733aa51f4b80c708111b38dbd169

Merge branch 'master' of http://nonxin.cn:8090/r/product/product-server-mobile-core/V2.0.0

# Conflicts:
#	.gitignore

 .classpath

ÎļþÒÑɾ³ý

 .factorypath

ÎļþÒÑɾ³ý

 .project

ÎļþÒÑɾ³ý

 .settings/org.eclipse.core.resources.prefs

ÎļþÒÑɾ³ý

 .settings/org.eclipse.jdt.apt.core.prefs

ÎļþÒÑɾ³ý

 .settings/org.eclipse.jdt.core.prefs

ÎļþÒÑɾ³ý

 .settings/org.eclipse.m2e.core.prefs

ÎļþÒÑɾ³ý

 .settings/org.eclipse.wst.common.component

ÎļþÒÑɾ³ý

 .settings/org.eclipse.wst.common.project.facet.core.xml

ÎļþÒÑɾ³ý

 .settings/org.eclipse.wst.validation.prefs

ÎļþÒÑɾ³ý

 pom.xml

@@ -15,17 +15,14 @@
        <dependency>
            <groupId>com.lx</groupId>
            <artifactId>product-server-common</artifactId>
            <version>2.0.0-release</version>
        </dependency>
        <dependency>
            <groupId>com.lx</groupId>
            <artifactId>product-server-util</artifactId>
            <version>2.0.0-release</version>
        </dependency>
        <dependency>
            <groupId>com.lx</groupId>
            <artifactId>product-server-admin</artifactId>
            <version>2.0.0-release</version>
        </dependency>
        <!--releases  -->
        <dependency>
@@ -36,7 +33,6 @@
        <dependency>
            <groupId>com.lx</groupId>
            <artifactId>product-server-file</artifactId>
            <version>2.0.0-release</version>
        </dependency>
    </dependencies>


 src/main/java/com/product/mobile/core/controller/ContactPersonController.java

@@ -1,5 +1,6 @@
package com.product.mobile.core.controller;

import com.product.common.lang.StringUtils;
import com.product.core.config.CoreConst;
import com.product.core.controller.support.AbstractBaseController;
import com.product.core.entity.FieldSetEntity;
@@ -14,9 +15,9 @@
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;


/**
 * é€šè¿…录
 * 
 * @Date 2022/3/3 19:54
 * @Desc
 */
@@ -36,7 +37,12 @@
             RequestParameterEntity reqp = (RequestParameterEntity) bean;
             fse = reqp.getFormData();
         }
        if (StringUtils.isEmpty(fse.getString("orgCode"))) {//延迟加载时，指定部门
        return this.OK_List(contanctOrgListService.orgList(fse));
        } else {
            return this.OK_List(contanctOrgListService.orgList(fse.getString("orgCode")));
        }

    }

}

 src/main/java/com/product/mobile/core/controller/SignInController.java

 src/main/java/com/product/mobile/core/controller/SystemFunctionController.java

@@ -1,12 +1,9 @@
package com.product.mobile.core.controller;

import com.product.admin.service.RouterService;
import com.product.core.config.CoreConst;
import com.product.core.controller.support.AbstractBaseController;
import com.product.core.entity.FieldSetEntity;
import com.product.core.entity.RequestParameterEntity;
import com.product.core.exception.BaseException;
import com.product.core.spring.context.SpringMVCContextHolder;
import com.product.mobile.core.config.MobileCoreCode;
import com.product.mobile.core.service.SystemFunctionService;
import com.product.module.sys.version.ApiVersion;

 src/main/java/com/product/mobile/core/service/ApplicationsService.java

 src/main/java/com/product/mobile/core/service/ContanctOrgListService.java

@@ -42,23 +42,48 @@
    public DataTableEntity orgList(FieldSetEntity fse) throws BaseException{
        SystemUser user=SpringMVCContextHolder.getCurrentUser();
        boolean all=Global.getPropertyToBoolean("mobile.contanct.org.all", "false").booleanValue();
        boolean delay=Global.getPropertyToBoolean("mobile.contanct.org.delay", "false").booleanValue();
    	
        String code=user.getCurrentCompany().getString("org_level_code");
        //公司部门
        StringBuilder b=new StringBuilder();
        b.append("select uuid,org_level_name name, org_level_type,org_level_code code,org_level_code_parent,org_level_type type from  product_sys_org_levels where  org_level_status=0 ");
        if(all) {b.append(" and org_level_code like '").append(code).append("%'");}//只加载公司
        b.append(" order by org_level_code");
        if(!all) {b.append(" and org_level_code like '").append(code).append("%'");}//只加载公司
        b.append(" order by LENGTH(org_level_code) ,org_level_type");
        DataTableEntity org=baseDao.listTable(b.toString(), new String[] {});
        //员工
        b=new StringBuilder();
        b.append("select a.uuid,a.tricode code, a.show_name name,a.contact_address,a.sex,b.thumbnail_img,a.job_post_uuid,c.job_post_name post,a.staff_email mail,a.office_telephone tel,a.mobile_phone mobile,2 type,d.org_level_name com from  product_sys_staffs a left join product_sys_users b on a.user_id=b.user_id left join product_sys_job_posts c on a.job_post_uuid=c.uuid left join product_sys_org_levels d on a.org_level_uuid=d.uuid where b.status=1 ");
        if(all) {b.append(" and  a.tricode like '").append(code).append("%'");}//只加载公司人员
//        b.append(" order by a.org_level_code");
    	
        if(delay) {//延迟回载，只加载当前人所在部门的人员
            b.append(" and  a.tricode like '").append(user.getCurrentDept().getString("org_level_code")).append("%'");
        }else if(!all) {
            b.append(" and  a.tricode like '").append(code).append("%'");
        }//只加载公司人员
        b.append(" order by CONVERT(a.show_name USING gbk) COLLATE gbk_chinese_ci ASC");
        DataTableEntity staff=baseDao.listTable(b.toString(), new String[] {});
        
        return parseData(org,staff);
    }
    
    /**
     *     å…ˆæŸ¥å‡ºåŽ†å²æ‰“卡记录
     * @param cpage
     * @param pagesize
     * @return
     * @throws BaseException
     */
    public DataTableEntity orgList(String orgCode) throws BaseException{
        SystemUser user=SpringMVCContextHolder.getCurrentUser();
        if(StringUtils.isEmpty(orgCode) || orgCode.equals(user.getCurrentDept().getString("tricode") )  ) {//当前人部门，也不用传
            return new DataTableEntity();
        }
        //员工
        StringBuilder b=new StringBuilder();
        b.append("select a.uuid,a.tricode code, a.show_name name,a.contact_address,a.sex,b.thumbnail_img,a.job_post_uuid,c.job_post_name post,a.staff_email mail,a.office_telephone tel,a.mobile_phone mobile,2 type,d.org_level_name com from  product_sys_staffs a left join product_sys_users b on a.user_id=b.user_id left join product_sys_job_posts c on a.job_post_uuid=c.uuid left join product_sys_org_levels d on a.org_level_uuid=d.uuid where b.status=1 ");
        b.append(" and  a.tricode = '").append(orgCode).append("'");
        DataTableEntity staff=baseDao.listTable(b.toString(), new String[] {});
        return staff;
    }
    /**
     * å¯¹æ•°æ®è¿›è¡Œå°è£…
     * @param dt

 src/main/java/com/product/mobile/core/service/NavBarManagerService.java

@@ -1,5 +1,6 @@
package com.product.mobile.core.service;

import cn.hutool.core.io.FileUtil;
import com.product.common.lang.StringUtils;
import com.product.core.entity.DataTableEntity;
import com.product.core.entity.FieldSetEntity;
@@ -14,7 +15,9 @@
import com.product.mobile.core.service.ide.INavBarManagerService;
import com.product.module.sys.entity.SystemUser;
import com.product.util.BaseUtil;
import com.product.util.sf.img4.util.ImageUtil;
import org.apache.commons.codec.binary.Base64;
import org.json.JSONArray;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@@ -157,8 +160,9 @@
        sql.append(" a.nav_bar_name, ");
        sql.append(" a.module_category, ");
        sql.append(" a.uuid ,");
        sql.append(" b.uuid ,");
        sql.append(" a.sequence, ");
        sql.append(" b.route_name ");
        sql.append(" b.route_name,a.module_sequence ");
        sql.append(" order by a.module_sequence,a.sequence");
        DataTableEntity dt = getBaseDao().listTable(sql.toString(), new Object[]{});
        if (!DataTableEntity.isEmpty(dt)) {

 src/main/java/com/product/mobile/core/service/SignInService.java

 src/main/java/com/product/mobile/core/service/SysMessageService.java

@@ -1,12 +1,13 @@
package com.product.mobile.core.service;

import com.product.admin.config.CmnConst;
import com.product.admin.service.UserService;
import com.product.core.dao.BaseDao;
import com.product.core.entity.DataTableEntity;
import com.product.core.entity.FieldSetEntity;
import com.product.core.service.support.AbstractBaseService;
import com.product.core.spring.context.SpringMVCContextHolder;
import com.product.module.sys.service.UserService;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

@@ -44,7 +45,7 @@
        FieldSetEntity tempFse;
        for (int i = 0;i < dte.getRows();i++) {
            tempFse = dte.getFieldSetEntity(i);
            tempFse.setValue("sender_avatar", userService.getUserAvatar(tempFse.getString("send_user_id")));
            tempFse.setValue(com.product.core.websocket.config.CmnConst.SEND_THUMBNAIL_IMG, userService.getUserAvatar(tempFse.getString("send_user_id_save_value")));
        }

        return dte;

 src/main/resources/META-INF/MANIFEST.MF

ÎļþÒÑɾ³ý

 src/main/resources/file.properties

ÎļþÒÑɾ³ý

 target/classes/META-INF/MANIFEST.MF

ÎļþÒÑɾ³ý

 target/classes/META-INF/maven/com.lx/product-server-mobile-core/pom.properties

ÎļþÒÑɾ³ý

 target/classes/META-INF/maven/com.lx/product-server-mobile-core/pom.xml

ÎļþÒÑɾ³ý

 target/classes/com/product/mobile/core/config/MobileCoreCode.class

Binary files differ

 target/classes/com/product/mobile/core/config/MobileCoreConst.class

Binary files differ

 target/classes/com/product/mobile/core/controller/ApplicationsController.class

Binary files differ

 target/classes/com/product/mobile/core/controller/ContactPersonController.class

Binary files differ

 target/classes/com/product/mobile/core/controller/MobileLoggerController.class

Binary files differ

 target/classes/com/product/mobile/core/controller/MobileNetWorkTestController.class

Binary files differ

 target/classes/com/product/mobile/core/controller/NavBarManagerController.class

Binary files differ

 target/classes/com/product/mobile/core/controller/SignInController.class

Binary files differ

 target/classes/com/product/mobile/core/controller/SysMessageController.class

Binary files differ

 target/classes/com/product/mobile/core/controller/SystemFunctionController.class

Binary files differ

 target/classes/com/product/mobile/core/entity/NavBarEntity.class

Binary files differ

 target/classes/com/product/mobile/core/service/ApplicationsService.class

Binary files differ

 target/classes/com/product/mobile/core/service/ContanctOrgListService.class

Binary files differ

 target/classes/com/product/mobile/core/service/NavBarManagerService.class

Binary files differ

 target/classes/com/product/mobile/core/service/SignInService.class

Binary files differ

 target/classes/com/product/mobile/core/service/SysMessageService.class

Binary files differ

 target/classes/com/product/mobile/core/service/SystemFunctionService.class

Binary files differ

 target/classes/com/product/mobile/core/service/ide/INavBarManagerService.class

Binary files differ

 target/classes/file.properties

ÎļþÒÑɾ³ý

 target/maven-archiver/pom.properties

ÎļþÒÑɾ³ý

 target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

ÎļþÒÑɾ³ý

 target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

ÎļþÒÑɾ³ý

 target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst

 target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst

 target/product-server-mobile-core-1.0.0-SNAPSHOT.jar

Binary files differ

 target/product-server-mobile-core-1.0.0.jar

Binary files differ

 target/surefire-reports/2021-05-27T14-18-50_985-jvmRun1.dump

ÎļþÒÑɾ³ý

 target/surefire-reports/2021-07-09T17-11-03_075-jvmRun1.dump

ÎļþÒÑɾ³ý

 target/surefire-reports/2021-07-09T17-11-03_075-jvmRun1.dumpstream

ÎļþÒÑɾ³ý