修改mybatis配置文件和在原有的基础上修改移动端口数据

product
chuang 2 years ago
parent 7bcde88b8f
commit 6ed099df61

@ -115,5 +115,6 @@
</plugin>
<!-- ... -->
</plugins>
</build>
</project>

@ -96,3 +96,10 @@ springfox:
#knife4j
knife4j:
production: false # 开启/屏蔽文档资源
#开启语句打印
mybatis-plus:
configuration:
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
mapper-locations: classpath*:mapper/**/*.xml

@ -219,6 +219,7 @@ public class MybatisPlusConfig {
ResourcePatternResolver resourceResolver = new PathMatchingResourcePatternResolver();
List<String> mapperLocations = new ArrayList<>();
mapperLocations.add("classpath:mapper/*/*.xml");
mapperLocations.add("classpath*:mapper/**/*.xml");
mapperLocations.add("classpath:mapper/*/*/*.xml");
List<Resource> resources = new ArrayList<Resource>();
for (String mapperLocation : mapperLocations) {

@ -19,6 +19,14 @@
</properties>
<dependencies>
<!--实体类转换-->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>23.4-jre</version>
</dependency>
<dependency>
<groupId>com.jnpf</groupId>
<artifactId>linkage-common</artifactId>
@ -167,4 +175,9 @@
</dependency>
</dependencies>
<build>
</build>
</project>

@ -15,6 +15,7 @@ import jnpf.base.UserInfo;
import jnpf.base.vo.DownloadVO;
import jnpf.config.ConfigValueUtil;
import jnpf.exception.DataException;
import jnpf.material.entity.MaterialMobileEntity;
import org.springframework.transaction.annotation.Transactional;
import jnpf.base.entity.ProvinceEntity;
import jnpf.material.model.material.*;
@ -84,9 +85,9 @@ public class MaterialController {
@ApiOperation("列表")
@PostMapping("/getList")
public ActionResult list(@RequestBody MaterialPagination materialPagination)throws IOException{
List<MaterialEntity> list= materialService.getList(materialPagination);
List<MaterialMobileEntity> list= materialService.getList(materialPagination);
//处理id字段转名称若无需转或者为空可删除
for(MaterialEntity entity:list){
for(MaterialMobileEntity entity:list){
Map<String,Object> outAreaMap = new HashMap<>();
entity.setOutArea(generaterSwapUtil.getPopupSelectValue("381404161809350213","id","areaname",entity.getOutArea(),outAreaMap));
Map<String,Object> inAreaMap = new HashMap<>();
@ -156,7 +157,7 @@ public class MaterialController {
return ActionResult.fail("请选择导出字段");
}
MaterialPagination materialPagination=JsonUtil.getJsonToBean(materialPaginationExportModel, MaterialPagination.class);
List<MaterialEntity> list= materialService.getTypeList(materialPagination,materialPaginationExportModel.getDataType());
List<MaterialMobileEntity> list= materialService.getTypeList(materialPagination,materialPaginationExportModel.getDataType());
//处理id字段转名称若无需转或者为空可删除
for(MaterialEntity entity:list){
Map<String,Object> outAreaMap = new HashMap<>();

@ -4,6 +4,7 @@ import com.alibaba.fastjson.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.google.common.base.Converter;
import lombok.Data;
import java.util.Date;
@ -112,4 +113,90 @@ public class MaterialEntity {
@TableField("ERROR_MESSAGE")
private String errorMessage;
// 转换方法
public MaterialMobileEntity convertTo() {
OrderConverter convert = new OrderConverter();
return convert.convert(this);
}
public MaterialEntity convertFrom(MaterialMobileEntity order) {
OrderConverter convert = new OrderConverter();
return convert.reverse().convert(order);
}
private static class OrderConverter extends Converter<MaterialEntity, MaterialMobileEntity> {
@Override
protected MaterialMobileEntity doForward(MaterialEntity materialMobileEntty) {
MaterialMobileEntity dto = new MaterialMobileEntity();
dto.setCreatortime(materialMobileEntty.getCreatortime());
dto.setCreatoruserid(materialMobileEntty.getCreatoruserid());
dto.setCreatorusername(materialMobileEntty.getCreatorusername());
dto.setDeletemark(materialMobileEntty.getDeletemark());
dto.setDeletetime(materialMobileEntty.getDeletetime());
dto.setDeleteuserid(materialMobileEntty.getDeleteuserid());
dto.setDeleteusername(materialMobileEntty.getDeleteusername());
dto.setDepartmentId(materialMobileEntty.getDepartmentId());
dto.setDescription(materialMobileEntty.getDescription());
dto.setEffectiveStatus(materialMobileEntty.getEffectiveStatus());
dto.setErrorMessage(materialMobileEntty.getErrorMessage());
dto.setId(materialMobileEntty.getId());
dto.setInArea(materialMobileEntty.getInArea());
dto.setItemCode(materialMobileEntty.getItemCode());
dto.setItemId(materialMobileEntty.getItemId());
dto.setLastmodifytime(materialMobileEntty.getLastmodifytime());
dto.setLastmodifyuserid(materialMobileEntty.getLastmodifyuserid());
dto.setLastmodifyusername(materialMobileEntty.getLastmodifyusername());
dto.setMId(materialMobileEntty.getMId());
dto.setOrganizationCode(materialMobileEntty.getOrganizationCode());
dto.setOrganizationId(materialMobileEntty.getOrganizationId());
dto.setOrgnizeId(materialMobileEntty.getOrgnizeId());
dto.setOutArea(materialMobileEntty.getOutArea());
dto.setPrimaryUnitOmeasure(materialMobileEntty.getPrimaryUnitOmeasure());
dto.setPrimaryUomCode(materialMobileEntty.getPrimaryUomCode());
dto.setProcessingType(materialMobileEntty.getProcessingType());
dto.setPurchaseFlag(materialMobileEntty.getPurchaseFlag());
dto.setReadDate(materialMobileEntty.getReadDate());
dto.setReadTag(materialMobileEntty.getReadTag());
dto.setSalesFlag(materialMobileEntty.getSalesFlag());
return dto;
}
//具体的转换内容
@Override
protected MaterialEntity doBackward(MaterialMobileEntity materialMobileEntty) {
MaterialEntity dto = new MaterialEntity();
dto.setCreatortime(materialMobileEntty.getCreatortime());
dto.setCreatoruserid(materialMobileEntty.getCreatoruserid());
dto.setCreatorusername(materialMobileEntty.getCreatorusername());
dto.setDeletemark(materialMobileEntty.getDeletemark());
dto.setDeletetime(materialMobileEntty.getDeletetime());
dto.setDeleteuserid(materialMobileEntty.getDeleteuserid());
dto.setDeleteusername(materialMobileEntty.getDeleteusername());
dto.setDepartmentId(materialMobileEntty.getDepartmentId());
dto.setDescription(materialMobileEntty.getDescription());
dto.setEffectiveStatus(materialMobileEntty.getEffectiveStatus());
dto.setErrorMessage(materialMobileEntty.getErrorMessage());
dto.setId(materialMobileEntty.getId());
dto.setInArea(materialMobileEntty.getInArea());
dto.setItemCode(materialMobileEntty.getItemCode());
dto.setItemId(materialMobileEntty.getItemId());
dto.setLastmodifytime(materialMobileEntty.getLastmodifytime());
dto.setLastmodifyuserid(materialMobileEntty.getLastmodifyuserid());
dto.setLastmodifyusername(materialMobileEntty.getLastmodifyusername());
dto.setMId(materialMobileEntty.getMId());
dto.setOrganizationCode(materialMobileEntty.getOrganizationCode());
dto.setOrganizationId(materialMobileEntty.getOrganizationId());
dto.setOrgnizeId(materialMobileEntty.getOrgnizeId());
dto.setOutArea(materialMobileEntty.getOutArea());
dto.setPrimaryUnitOmeasure(materialMobileEntty.getPrimaryUnitOmeasure());
dto.setPrimaryUomCode(materialMobileEntty.getPrimaryUomCode());
dto.setProcessingType(materialMobileEntty.getProcessingType());
dto.setPurchaseFlag(materialMobileEntty.getPurchaseFlag());
dto.setReadDate(materialMobileEntty.getReadDate());
dto.setReadTag(materialMobileEntty.getReadTag());
dto.setSalesFlag(materialMobileEntty.getSalesFlag());
return dto;
}
}
}

@ -0,0 +1,120 @@
package jnpf.material.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import java.util.Date;
/**
* @Author: WangChuang
* @Date: 2/2/2023 3:31
* @Description //注释:
* @Version 1.0
*/
@Data
public class MaterialMobileEntity extends MaterialEntity {
@TableId("ID")
private String id;
@TableField("CREATOR_USER_ID")
private String creatoruserid;
@TableField("CREATOR_USER_NAME")
private String creatorusername;
@TableField("CREATOR_TIME")
private Date creatortime;
@TableField("LAST_MODIFY_USER_ID")
private String lastmodifyuserid;
@TableField("LAST_MODIFY_USER_NAME")
private String lastmodifyusername;
@TableField("LAST_MODIFY_TIME")
private Date lastmodifytime;
@TableField("DELETE_USER_ID")
private String deleteuserid;
@TableField("DELETE_USER_NAME")
private String deleteusername;
@TableField("DELETE_TIME")
private Date deletetime;
@TableField("DELETE_MARK")
private String deletemark;
@TableField("ORGNIZE_ID")
private String orgnizeId;
@TableField("DEPARTMENT_ID")
private String departmentId;
@TableField("M_ID")
private String mId;
@TableField("ITEM_ID")
private String itemId;
@TableField("ITEM_CODE")
private String itemCode;
@TableField("ORGANIZATION_ID")
private String organizationId;
@TableField("ORGANIZATION_CODE")
private String organizationCode;
@TableField("DESCRIPTION")
private String description;
@TableField("PRIMARY_UOM_CODE")
private String primaryUomCode;
@TableField("PRIMARY_UNIT_OF_MEASURE")
private String primaryUnitOmeasure;
@TableField("PURCHASE_FLAG")
private String purchaseFlag;
@TableField("SALES_FLAG")
private String salesFlag;
@TableField("IN_AREA")
private String inArea;
@TableField("OUT_AREA")
private String outArea;
@TableField("EFFECTIVE_STATUS")
private String effectiveStatus;
@TableField("PROCESSING_TYPE")
private String processingType;
@TableField("READ_TAG")
private String readTag;
@TableField("READ_DATE")
private Date readDate;
@TableField("ERROR_MESSAGE")
private String errorMessage;
// 采购次数
private Integer purchasesNumber;
// 采购量(吨)
private Double purchasesWeight;
// 销售次数
private Integer salesNumber;
// 销售量
private Double salesWeight;
// 转换方法
//创建转换方法
}

@ -1,8 +1,13 @@
package jnpf.material.mapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import jnpf.material.entity.MaterialEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import jnpf.material.entity.MaterialMobileEntity;
import org.apache.ibatis.annotations.Param;
/**
*
@ -14,4 +19,15 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface MaterialMapper extends BaseMapper<MaterialEntity> {
/**
*
* @param page
* @param queryWrapper
* @return
*/
Object getMaterialMobileList111();
IPage<MaterialMobileEntity> getMaterialMobileList(@Param("page") IPage<MaterialMobileEntity> page,
@Param("ew") Wrapper<MaterialEntity> queryWrapper);
}

@ -116,5 +116,15 @@ public class MaterialListVO{
@JsonProperty("errorMessage")
private String errorMessage;
@JsonProperty("purchasesNumber")
private Integer purchasesNumber;
// 采购量(吨)
@JsonProperty("purchasesWeight")
private Double purchasesWeight;
// 销售次数
@JsonProperty("salesNumber")
private Integer salesNumber;
// 销售量
@JsonProperty("salesWeight")
private Double salesWeight;
}

@ -1,7 +1,11 @@
package jnpf.material.service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jnpf.material.entity.MaterialEntity;
import com.baomidou.mybatisplus.extension.service.IService;
import jnpf.material.entity.MaterialMobileEntity;
import jnpf.material.model.material.MaterialPagination;
import java.util.*;
/**
@ -13,10 +17,12 @@ import java.util.*;
* 2023-01-05
*/
public interface MaterialService extends IService<MaterialEntity> {
IPage<MaterialMobileEntity> pagee(Page<MaterialMobileEntity> page, Wrapper<MaterialEntity> queryWrapper);
Object tesx();
List<MaterialMobileEntity> getList(MaterialPagination materialPagination);
List<MaterialEntity> getList(MaterialPagination materialPagination);
List<MaterialMobileEntity> getTypeList(MaterialPagination materialPagination,String dataType);
List<MaterialEntity> getTypeList(MaterialPagination materialPagination,String dataType);

@ -1,5 +1,8 @@
package jnpf.material.service.impl;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import jnpf.material.entity.*;
import jnpf.material.mapper.MaterialMapper;
import jnpf.material.service.*;
@ -22,14 +25,13 @@ import java.util.stream.Collectors;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import java.text.SimpleDateFormat;
import jnpf.util.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.*;
/**
@ -50,12 +52,14 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, MaterialEnt
@Autowired
private AuthorizeService authorizeService;
@Resource
private MaterialMapper materialMapper;
@Override
public List<MaterialEntity> getList(MaterialPagination materialPagination){
public List<MaterialMobileEntity> getList(MaterialPagination materialPagination){
String userId=userProvider.get().getUserId();
List<String> AllIdList =new ArrayList();
int total=0;
@ -116,17 +120,24 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, MaterialEnt
e.printStackTrace();
}
}
ArrayList<MaterialMobileEntity> list1 = new ArrayList<>();
if((total>0 && AllIdList.size()>0) || total==0){
Page<MaterialEntity> page=new Page<>(materialPagination.getCurrentPage(), materialPagination.getPageSize());
IPage<MaterialEntity> userIPage=this.page(page, materialQueryWrapper);
return materialPagination.setData(userIPage.getRecords(),userIPage.getTotal());
Page<MaterialMobileEntity> page=new Page<>(materialPagination.getCurrentPage(), materialPagination.getPageSize());
IPage<MaterialMobileEntity> userIPage=this.pagee(page, materialQueryWrapper);
List<MaterialMobileEntity> materialEntities = materialPagination.setData(userIPage.getRecords(), userIPage.getTotal());
return materialEntities;
}else{
List<MaterialEntity> list = new ArrayList();
return materialPagination.setData(list, list.size());
List<MaterialEntity> materialEntities = materialPagination.setData(list, list.size());
for (MaterialEntity materialEntity : materialEntities) {
list1.add(materialEntity.convertTo());
}
return list1;
}
}
@Override
public List<MaterialEntity> getTypeList(MaterialPagination materialPagination,String dataType){
public List<MaterialMobileEntity> getTypeList(MaterialPagination materialPagination,String dataType){
String userId=userProvider.get().getUserId();
List<String> AllIdList =new ArrayList();
int total=0;
@ -189,15 +200,20 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, MaterialEnt
}
if("0".equals(dataType)){
if((total>0 && AllIdList.size()>0) || total==0){
Page<MaterialEntity> page=new Page<>(materialPagination.getCurrentPage(), materialPagination.getPageSize());
IPage<MaterialEntity> userIPage=this.page(page, materialQueryWrapper);
Page<MaterialMobileEntity> page=new Page<>(materialPagination.getCurrentPage(), materialPagination.getPageSize());
IPage<MaterialMobileEntity> userIPage=this.pagee(page, materialQueryWrapper);
return materialPagination.setData(userIPage.getRecords(),userIPage.getTotal());
}else{
List<MaterialEntity> list = new ArrayList();
List<MaterialMobileEntity> list = new ArrayList();
return materialPagination.setData(list, list.size());
}
}else{
return this.list(materialQueryWrapper);
List<MaterialEntity> list = list(materialQueryWrapper);
List<MaterialMobileEntity> list2 = new ArrayList<>();
for (MaterialEntity materialEntity : list) {
list2.add(materialEntity.convertTo());
}
return list2;
}
}
@ -224,6 +240,24 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, MaterialEnt
this.removeById(entity.getId());
}
}
@Override
public <E extends IPage<MaterialEntity>> E page(E page) {
return super.page(page);
}
public IPage<MaterialMobileEntity> pagee(Page<MaterialMobileEntity> page, Wrapper<MaterialEntity> queryWrapper) {
IPage<MaterialMobileEntity> materialMobileList = materialMapper.getMaterialMobileList(page, queryWrapper);
// IPage<MaterialMobileEntity> materialMobileList = materialMapper.getMaterialMobileList(null, null);
// return super.page(page, queryWrapper);
return materialMobileList;
}
@Override
public Object tesx() {
return materialMapper.getMaterialMobileList111();
}
//子表方法
//列表子表数据方法

@ -23,6 +23,10 @@ public class WarehouseListVO{
/** 主键 */
private String id;
/*仓库名称 */
@JsonProperty("name")
private String name;
/** 仓库编码 **/
@JsonProperty("code")

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="jnpf.material.mapper.MaterialMapper">
</mapper>

@ -0,0 +1,107 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="jnpf.material.mapper.MaterialMapper">
<select id="getMaterialMobileList111" resultType="map">
select * from jg_poundlist
</select>
<!--获取派工单信息-->
<select id="getMaterialMobileList" resultMap="findWorkOrderByCondition">
SELECT
*
FROM
(
SELECT
a.id id,
a.creator_user_id creator_user_id,
a.creator_user_name creator_user_name,
a.creator_time creator_time,
a.last_modify_user_id last_modify_user_id,
a.last_modify_user_name last_modify_user_name,
a.last_modify_time last_modify_time,
a.delete_user_id delete_user_id,
a.delete_user_name delete_user_name,
a.delete_time delete_time,
a.delete_mark delete_mark,
a.orgnize_id orgnize_id,
a.department_id department_id,
a.m_id m_id,
a.item_id item_id,
a.item_code item_code,
a.organization_id organization_id,
a.organization_code organization_code,
a.description description,
a.primary_uom_code primary_uom_code,
a.primary_unit_of_measure primary_unit_of_measure,
a.purchase_flag purchase_flag,
a.sales_flag sales_flag,
a.in_area in_area,
a.out_area out_area,
a.effective_status effective_status,
a.processing_type processing_type,
a.read_tag read_tag,
a.read_date read_date,
a.error_message error_message,
IFNULL( SUM( b.settlement ), 0.0000000000 ) purchasesWeight,
(
CASE
( SELECT COUNT( DISTINCT COALESCE ( purchase_code, 'NULL' )) FROM jg_poundlist WHERE material_code = a.id )
WHEN 0 THEN
0.0000000000 ELSE IFNULL( SUM( b.settlement ), 0.0000000000 )
END
) salesWeight,
( SELECT COUNT( DISTINCT COALESCE ( purchase_code, 'NULL' )) FROM jg_poundlist WHERE material_code = a.id ) salesNumber,
( SELECT COUNT( DISTINCT COALESCE ( purchase_code, 'NULL' )) FROM jg_poundlist WHERE material_code = a.id OR material_code IS NULL ) purchasesNumber
FROM
jg_material a
LEFT JOIN jg_poundlist b ON a.id = b.material_code
AND ( b.purchase_status != 0 OR b.purchase_status IS NULL )
AND ( b.purchase_status != 99 OR b.purchase_status IS NULL )
AND ( b.pound_status != '1' OR b.pound_status IS NULL )
GROUP BY
a.id
) aaa
${ew.customSqlSegment}
</select>
<!--获取派工单信息映射-->
<resultMap id="findWorkOrderByCondition" type="jnpf.material.entity.MaterialMobileEntity">
<result column="id" property="id"/>
<result column="creator_user_id" property="creatoruserid"/>
<result column="creator_user_name" property="creatorusername"/>
<result column="creator_time" property="creatortime"/>
<result column="last_modify_user_id" property="lastmodifyuserid"/>
<result column="last_modify_user_name" property="lastmodifyusername"/>
<result column="last_modify_time" property="lastmodifytime"/>
<result column="delete_user_id" property="deleteuserid"/>
<result column="delete_user_name" property="deleteusername"/>
<result column="delete_time" property="deletetime"/>
<result column="delete_mark" property="deletemark"/>
<result column="orgnize_id" property="orgnizeId"/>
<result column="department_id" property="departmentId"/>
<result column="m_id" property="mId"/>
<result column="item_id" property="itemId"/>
<result column="item_code" property="itemCode"/>
<result column="organization_id" property="organizationId"/>
<result column="organization_code" property="organizationCode"/>
<result column="description" property="description"/>
<result column="primary_uom_code" property="primaryUomCode"/>
<result column="primary_unit_of_measure" property="primaryUnitOmeasure"/>
<result column="purchase_flag" property="purchaseFlag"/>
<result column="sales_flag" property="salesFlag"/>
<result column="in_area" property="inArea"/>
<result column="out_area" property="outArea"/>
<result column="effective_status" property="effectiveStatus"/>
<result column="processing_type" property="processingType"/>
<result column="read_tag" property="readTag"/>
<result column="read_date" property="readDate"/>
<result column="error_message" property="errorMessage"/>
<result column="purchasesNumber" property="purchasesNumber"/>
<result column="purchasesWeight" property="purchasesWeight"/>
<result column="salesNumber" property="salesNumber"/>
<result column="salesWeight" property="salesWeight"/>
</resultMap>
</mapper>

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/temp" />
<excludeFolder url="file://$MODULE_DIR$/.tmp" />
<excludeFolder url="file://$MODULE_DIR$/tmp" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/SC-screen-web.iml" filepath="$PROJECT_DIR$/.idea/SC-screen-web.iml" />
</modules>
</component>
</project>

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$/.." vcs="Git" />
</component>
</project>

@ -1,7 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="AutoImportSettings">
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="333ef277-f96a-478b-8e69-06cf9047295d" name="Default Changelist" comment="" />
<list default="true" id="333ef277-f96a-478b-8e69-06cf9047295d" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@ -16,13 +21,21 @@
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent">
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../../SC-SCREEN/SC-screen-web" />
<property name="nodejs_package_manager_path" value="yarn" />
</component>
<component name="PropertiesComponent"><![CDATA[{
"keyToString": {
"RunOnceActivity.OpenProjectViewOnStart": "true",
"RunOnceActivity.ShowReadmeOnStart": "true",
"WebServerToolWindowFactoryState": "false",
"last_opened_file_path": "D:/changjiangyunxi/news/SC-MOM/SC-web",
"node.js.detected.package.eslint": "true",
"node.js.detected.package.tslint": "true",
"node.js.selected.package.eslint": "(autodetect)",
"node.js.selected.package.tslint": "(autodetect)",
"nodejs_package_manager_path": "yarn",
"vue.rearranger.settings.migration": "true"
}
}]]></component>
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
<component name="SvnConfiguration">
<configuration />
</component>
@ -44,40 +57,23 @@
<workItem from="1670383959834" duration="5140000" />
<workItem from="1670400276091" duration="1543000" />
<workItem from="1670459374466" duration="1209000" />
<workItem from="1675301603383" duration="748000" />
<workItem from="1675303285003" duration="106000" />
</task>
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="2" />
<option name="version" value="3" />
</component>
<component name="WindowStateProjectService">
<state x="414" y="171" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1670461969483">
<screen x="0" y="0" width="1920" height="1032" />
</state>
<state x="414" y="171" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1920.1032@0.0.1920.1032" timestamp="1670461969483" />
<state x="740" y="271" key="FileChooserDialogImpl" timestamp="1670462438756">
<screen x="0" y="0" width="1920" height="1032" />
</state>
<state x="740" y="271" key="FileChooserDialogImpl/0.0.1920.1032@0.0.1920.1032" timestamp="1670462438756" />
<state width="1882" height="276" key="GridCell.Tab.0.bottom" timestamp="1670405081579">
<screen x="0" y="0" width="1920" height="1032" />
</state>
<state width="1882" height="276" key="GridCell.Tab.0.bottom/0.0.1920.1032@0.0.1920.1032" timestamp="1670405081579" />
<state width="1882" height="276" key="GridCell.Tab.0.center" timestamp="1670405081579">
<screen x="0" y="0" width="1920" height="1032" />
</state>
<state width="1882" height="276" key="GridCell.Tab.0.center/0.0.1920.1032@0.0.1920.1032" timestamp="1670405081579" />
<state width="1882" height="276" key="GridCell.Tab.0.left" timestamp="1670405081579">
<screen x="0" y="0" width="1920" height="1032" />
</state>
<state width="1882" height="276" key="GridCell.Tab.0.left/0.0.1920.1032@0.0.1920.1032" timestamp="1670405081579" />
<state width="1882" height="276" key="GridCell.Tab.0.right" timestamp="1670405081579">
<screen x="0" y="0" width="1920" height="1032" />
</state>
<state width="1882" height="276" key="GridCell.Tab.0.right/0.0.1920.1032@0.0.1920.1032" timestamp="1670405081579" />
<state x="662" y="224" width="596" height="584" key="find.popup" timestamp="1670389659846">
<screen x="0" y="0" width="1920" height="1032" />
</state>
<state x="662" y="224" width="596" height="584" key="find.popup/0.0.1920.1032@0.0.1920.1032" timestamp="1670389659846" />
<component name="Vcs.Log.Tabs.Properties">
<option name="TAB_STATES">
<map>
<entry key="MAIN">
<value>
<State />
</value>
</entry>
</map>
</option>
</component>
</project>
Loading…
Cancel
Save